权限标识

src/views/zdsz/engineeringCivil/index.vue

@@ -110,7 +110,7 @@
           icon="el-icon-circle-check"
           size="mini"
           @click="handleCheckings"
-          v-hasPermi="['zdsz:engineeringCivil:export']"
+          v-hasPermi="['zdsz:engineeringCivil:review']"
         >批量审核
         </el-button>
       </el-col>
@@ -156,7 +156,7 @@
             type="text"
             icon="el-icon-edit"
             @click="addNodeInfo(scope.row)"
-            v-hasPermi="['zdsz:engineeringCivil:edit']"
+            v-hasPermi="['zdsz:engineeringCivil:add']"
           >填写节点信息
           </el-button>
           <el-button
@@ -172,7 +172,7 @@
             type="text"
             icon="el-icon-circle-check"
             @click="viewSource(scope.row,'check')"
-            v-hasPermi="['zdsz:engineeringCivil:remove']"
+            v-hasPermi="['zdsz:engineeringCivil:review']"
           >审核
           </el-button>
           <el-button
@@ -180,13 +180,14 @@
             type="text"
             icon="el-icon-time"
             @click="viewSource(scope.row)"
-            v-hasPermi="['zdsz:engineeringCivil:remove']"
+            v-hasPermi="['zdsz:engineeringCivil:query']"
           >历史用料
           </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-hasPermi="['zdsz:engineeringPipeJacking:add']"
             @click="addNewPipe(scope.row)"
           >新增顶管工程
           </el-button>
@@ -194,6 +195,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-hasPermi="['zdsz:engineeringCivil:add']"
             @click="addMaterial(scope.row)"
           >添加用料
           </el-button>
@@ -478,9 +480,9 @@
           label="审核内容"
           >
           <div class="block" style="display: inline-block; margin-right: 20px;">
-              <el-input 
-                v-model="checkingForm.reviewContent" 
-                placeholder="请输入审核内容" 
+              <el-input
+                v-model="checkingForm.reviewContent"
+                placeholder="请输入审核内容"
                 type="textarea"
                 style="width: 100%"/>
           </div>
@@ -496,7 +498,7 @@
 
   </div>
 </template>
-
+<!--engineeringPipeJacking-->
 <script>
 import {
   listEngineeringCivil,
@@ -940,7 +942,7 @@ export default {
           value:'0',
           label:'不通过'
         }
-      ],  
+      ],
     };
   },
   created() {
@@ -1004,7 +1006,7 @@ export default {
           });
           this.$refs.ConstructionDetails.dialogVisible = false
           this.updateParams = {}
-          
+
         }
       })
     },
@@ -1027,7 +1029,7 @@ export default {
     viewNodeSource(e) {
       viewEngineeringCivilSource({
         id: this.enginId,
-        type: e 
+        type: e
       }).then(res => {
         console.log('______',res)
         this.createTime = res.data.createTime

src/views/zdsz/engineeringIndustry/index.vue

@@ -90,12 +90,14 @@
             type="text"
             icon="el-icon-edit"
             size="mini"
+            v-hasPermi="['zdsz:engineeringIndustry:edit']"
             @click="updateviewSource(scope.row)"
           >修改节点信息
           </el-button>
           <el-button type="text"
                      icon="el-icon-edit"
                      size="mini"
+                     v-hasPermi="['zdsz:engineeringIndustry:add']"
                      @click="addzEngineeringMaterBo(scope.row)"
           >新增用料信息
           </el-button>
@@ -103,6 +105,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-hasPermi="['zdsz:engineeringPipeJacking:add']"
             @click="addNewPipe(scope.row)"
           >新增顶管工程
           </el-button>
@@ -110,6 +113,7 @@
             type="text"
             icon="el-icon-edit"
             size="mini"
+            v-hasPermi="['zdsz:engineeringIndustry:query']"
             @click="viewSource(scope.row)"
           >历史
           </el-button>
@@ -192,7 +196,7 @@
             <el-form-item label="附件" prop="files" v-if="queryParams.id" style="width: 100%">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
-                             :value="form.pics" @removeFile="removeFile"
+                             :value="form.pics"
               ></ObsFileUpload>
             </el-form-item>
             <el-form-item label="附件" prop="files" v-else style="width: 100%">
@@ -600,11 +604,27 @@ export default {
     },
     //新增用料信息
     addzEngineeringMaterialBo() {
-      this.zEngineeringMaterialBo.push({
-        materialQuality: '', // 用料材质
-        specifications: '', // 用料规格
-        number: '' // 用料数量
-      })
+      if (this.zEngineeringMaterialBo.length > 0) {
+        let valid = true;
+        if (this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['materialQuality'] == '' || this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['materialQuality'] == null) {
+          valid = false;
+        }
+        if (this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['specifications'] == '' || this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['specifications'] == null) {
+          valid = false;
+        }
+        if (this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['number'] == '' || this.zEngineeringMaterialBo[this.zEngineeringMaterialBo.length - 1]['number'] == null) {
+          valid = false;
+        }
+        if (valid) {
+          this.zEngineeringMaterialBo.push({
+            materialQuality: '', // 用料材质
+            specifications: '', // 用料规格
+            number: '' // 用料数量
+          })
+        } else {
+          this.$message.warning('完善信息!')
+        }
+      }
     },
     // 删除用料信息
     removezEngineeringMaterialBo(index) {
@@ -752,16 +772,15 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-      this.form.files = this.$refs.obsFileUpload.fileList;
-      console.log(this.form.files)
-      if (this.form.files.length === 0) {
-        this.$message.warning('必须上传附件!')
-        return
-      }
       this.form.zEngineeringNodeBo = this.zEngineeringNodeBo
       this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.files = this.$refs.obsFileUpload.fileList;
+          if (this.form.files.length === 0) {
+            this.$message.warning('必须上传附件!')
+            return
+          }
           if (this.form.id == null) {
             addEngineeEngineeIndustry(this.form).then(res => {
               this.$modal.msgSuccess("新增成功");