Преглед изворни кода

Merge remote-tracking branch 'origin/master'

lizhenhao пре 2 година
родитељ
комит
f73b3c247e

+ 1 - 1
src/views/modules/program/registered/ProjectThreeAuditForm.vue

@@ -59,7 +59,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row :gutter="15">
             <el-col :span="12">
               <el-form-item label="选择项目审核人" prop="auditPeople"
                             :rules="[{required: true, message: '审批人不能为空', trigger: 'blur'},{required: true, message: '审批人不能为空', trigger: 'change'}]"

+ 3 - 8
src/views/modules/sys/workContract/WorkContractForm.vue

@@ -558,18 +558,13 @@
         if (fees.length > 0) {
           fees.forEach(i => {
             if (i === '1') {
-              i = '计价格(2002)1980号文下浮%'
+              i = '发改价格[2009]2914号'
+              fee = fee + ';' + i
             }
             if (i === '2') {
-              i = '苏价服(2014)383号文下浮%'
-            }
-            if (i === '3') {
-              i = '标段 元/标段'
-            }
-            if (i === '4') {
               i = '其他'
+              fee = fee + ';' + i
             }
-            fee = fee + ';' + i
             this.inputForm.contractFee = fee.substring(1, fee.length)
           })
         }