Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_vue into zdsz3.0

src/components/EngineePipe/index.vue

@@ -93,11 +93,11 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="文件" prop="" v-if="currentType=='put'">
-                <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="queryParams.pics" :disabled="title == '添加用料' "
+                <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"  :value="queryParams.pics" :disabled="title == '添加用料' "
                 ></ObsFileUpload>
               </el-form-item>
               <el-form-item label="文件" prop="" v-if="currentType=='add'">
-                <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="queryParams.files" :disabled="title == '添加用料' "
+                <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"  :value="queryParams.files" :disabled="title == '添加用料' "
                 ></ObsFileUpload>
               </el-form-item>
             </el-col>
@@ -357,21 +357,18 @@ export default {
       }
     },
     async openDialog(data, type,sata) {
-      console.log(data,sata)
       await this.reset();
       this.currentType = type
       if (this.currentType == 'add') {
         this.title = '新增顶管信息'
+        this.queryParams.enginId = data.id
       } else if (this.currentType == 'put') {
         this.title = '修改顶管信息'
       } else if (this.currentType == 'addMaterial') {
         this.title = '添加用料'
-        this.enginNodeStatus == '添加用料'
+        this.enginNodeStatus = '添加用料'
         this.queryParams = sata
-        this.open = true
-        return
       }
-      this.queryParams.enginId = data.id
       this.queryParams.type = data.type
       //带值(民用工程、工业工程、市政工程)
       if (data.type=='民用工程'){
@@ -410,12 +407,10 @@ export default {
         }})
     },
     toNodeDetail() {
-      console.log(this.queryParams)
       let nodeCollection = []
       // 收集节点信息
       this.currentCheckList.forEach((e, idx) => {
         let nodeItem = this.$refs['EnginNodeInfo' + idx][0].infoCollection()
-        //  console.log(nodeItem)
         nodeCollection.push(nodeItem)
       })
       this.queryParams.zEngineeringNodeBoList = nodeCollection
@@ -434,11 +429,12 @@ export default {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.currentCheckList = []
-                // this.getList();
+                this.getList();
               })
             }
           }})
-      } else if(this.enginNodeStatus == '添加用料'){
+      }
+      else if(this.enginNodeStatus == '添加用料'){
         addEngineeringPipeJacking(this.queryParams).then(res => {
           if(res.code == 200){
             this.$message({
@@ -452,47 +448,30 @@ export default {
             // this.$emit('closeToSucceed')
           }
         })
-      } else {
-        this.queryParams.files = this.$refs.obsFileUpload.fileList;
-        if (this.$refs.obsFileUpload.fileList==null||this.$refs.obsFileUpload.fileList.length===0){
-          this.$message.warning('必须上传文件!')
-          return
-        }
-        addEngineeringPipeJacking(this.queryParams).then(res => {
-          if (res.code == 200) {
-            this.$message({
-              message: '新增成功',
-              type: 'success'
-            });
-            this.open = false
-            console.log('选中节点集合', this.currentCheckList)
-            this.currentCheckList = []
-            // this.$emit('closeToSucceed')
-          }
-        })
-      }
-      return
-      if (this.$refs.obsFileUpload.fileList==null||this.$refs.obsFileUpload.fileList.length===0){
-        this.$message.warning('必须上传文件!')
-        return
       }
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          getDictList({enginType:['pipe_jack']}).then(res => {
-            this.nodeList = res.data
-            this.nodeList.forEach(e => {
-              e.name = e.value
-            })
-            if (this.currentType == 'put') {
-              this.queryParams.files = this.$refs.obsFileUpload.fileList;
-              this.$refs.childNode.open(this.queryParams, 15,this.nodeList)
-            } else if (this.currentType == 'add') {
-              this.queryParams.files = this.$refs.obsFileUpload.fileList;
-              this.$refs.childNode.open(this.queryParams, 10,this.nodeList)
+      else {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            this.queryParams.files = this.$refs.obsFileUpload.fileList;
+            if (this.$refs.obsFileUpload.fileList==null||this.$refs.obsFileUpload.fileList.length===0){
+              this.$message.warning('必须上传文件!')
+              return
             }
-          })
-        }
-      });
+            addEngineeringPipeJacking(this.queryParams).then(res => {
+              if (res.code == 200) {
+                this.$message({
+                  message: '新增成功',
+                  type: 'success'
+                });
+                this.open = false
+                console.log('选中节点集合', this.currentCheckList)
+                this.currentCheckList = []
+                this.getList()
+                // this.$emit('closeToSucceed')
+              }
+            })
+          }})
+      }
     },
     // 取消按钮
     cancel() {
@@ -502,7 +481,6 @@ export default {
     // 表单重置
     reset() {
       this.resetForm("form");
-      this.resetForm("nodeForm");
     },
     /** 提交按钮 */
     submitForm() {
@@ -517,7 +495,7 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .appendElDialog {
-  width: 850px;
+  width: 950px;
   height: 700px;
 
   .el-dialog__footer {

src/components/ObsImageUpload/indexFile.vue

@@ -15,7 +15,7 @@
                :headers="headers"
     >
       <div slot="tip" class="el-upload__tip">
-        cad文件类型：dwg，dwt；word文件类型：doc，docx；Excel文件类型：xls,xlsx;照片文件类型：jpg,png,jpeg
+        cad文件类型：dwg，dwt；word文件类型：doc，docx；Excel文件类型：xls,xlsx;照片文件类型：jpg,png,jpeg; mp4类型
       </div>
       <el-button class="el-icon-plus abs" type="primary">上传文件</el-button>
     </el-upload>
@@ -64,7 +64,7 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ['dwg', 'dwt', 'doc', 'docx', 'xls', 'xlsx', 'png', 'jpg', 'jpeg'],
+      default: () => ['dwg', 'dwt', 'doc', 'docx', 'xls', 'xlsx', 'png', 'jpg', 'jpeg','mp4'],
     },
     // 是否显示提示
     isShowTip: {
@@ -165,8 +165,8 @@ export default {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
           let name = '';
           let flag = false;
-          if (!['dwg', 'dwt', 'doc', 'docx', 'xls', 'xlsx', 'png', 'jpg', 'jpeg'].includes(fileExtension)) {
-            name = 'cad文件类型：dwg，dwt；word文件类型：doc，docx；Excel文件类型：xls,xlsx;照片文件类型：jpg,png,jpeg';
+          if (!['dwg', 'dwt', 'doc', 'docx', 'xls', 'xlsx', 'png', 'jpg', 'jpeg','mp4'].includes(fileExtension)) {
+            name = 'cad文件类型：dwg，dwt；word文件类型：doc，docx；Excel文件类型：xls,xlsx;照片文件类型：jpg,png,jpeg,mp4类型';
             flag = true
           }
           if (flag == true) {

src/views/zdsz/enginMaterialQuality/index.vue

@@ -77,7 +77,7 @@
 
     <el-table v-loading="loading" :data="enginMaterialQualityList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="id" align="center" prop="id" v-if="true"/>
+<!--      <el-table-column label="id" align="center" prop="id" v-if="true"/>-->
       <el-table-column label="工程类型" align="center" prop="enginType">
         <template slot-scope="scope">
           <dict-tag v-for="item in scope.row.enginType.split(',')" :options="dict.type.engin_type" :value="item"/>

src/views/zdsz/enginSpecifications/index.vue

@@ -77,7 +77,7 @@
 
     <el-table v-loading="loading" :data="enginSpecificationsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="id" align="center" prop="id" v-if="true"/>
+<!--      <el-table-column label="id" align="center" prop="id" v-if="true"/>-->
       <el-table-column label="材质名称" align="center" prop="materName"/>
       <el-table-column label="材质名称" align="center" prop="name"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/zdsz/engineeringDangerous/index.vue

@@ -401,13 +401,13 @@
           <el-col :span="24">
             <el-form-item label="附件" prop="files" v-if="form.id">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
-                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
+                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
                              :value="form.pics"
               ></ObsFileUpload>
             </el-form-item>
             <el-form-item label="附件" prop="files" v-else>
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
-                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
+                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
                              :value="form.files"
               ></ObsFileUpload>
             </el-form-item>

src/views/zdsz/engineeringIndustry/index.vue

@@ -195,13 +195,13 @@
           <el-col :span="24">
             <el-form-item label="附件" prop="files" v-if="form.id" style="width: 100%">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
-                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
+                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
                              :value="form.pics"
               ></ObsFileUpload>
             </el-form-item>
             <el-form-item label="附件" prop="files" v-else style="width: 100%">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
-                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
+                             :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
                              :value="form.files"
               ></ObsFileUpload>
             </el-form-item>
@@ -595,6 +595,7 @@ export default {
         if (valid) {
           this.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
           this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
+          this.zEngineeringNodeBo.type=this.$route.query.type
           this.$refs.nodeForm.validate(valid => {
             if (valid) {
               EditEngineeEngineeIndustry(this.form).then(res => {

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -165,11 +165,11 @@
           <el-input v-model="queryParams.plannedDuration" placeholder="请输入计划工期" maxlength="50"></el-input>
         </el-form-item>
         <el-form-item label="文件" prop="files" v-if="queryParams.id">
-          <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="queryParams.pics" @input="filesUpload"
+          <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"  :value="queryParams.pics" @input="filesUpload"
           ></ObsFileUpload>
         </el-form-item>
         <el-form-item label="文件" prop="files" v-else>
-          <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="queryParams.files" @input="filesUpload"
+          <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"  :value="queryParams.files" @input="filesUpload"
           ></ObsFileUpload>
         </el-form-item>
 

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -52,7 +52,7 @@
             <el-table-column label="工程规模" align="center" prop="enginScale" />
             <el-table-column label="施工质量" align="center" prop="constructQuality" />
             <el-table-column label="施工进度" align="center" prop="constructSchedule" />
-            <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
+<!--            <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>-->
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
               <template slot-scope="scope">
                   <!-- <el-button
@@ -547,10 +547,10 @@
           },
           // 新增物料
           addMaterial(data) {
+            this.reset();
             this.title = "添加用料";
             this.enginNodeStatus = '添加用料'
             this.loading = true;
-            this.reset();
             const id = data.id || this.ids
             viewEngineeringPipeJacking(id).then(res => {
               this.loading = false;