Merge remote-tracking branch 'origin/master'

src/views/modules/changeManagement/approvalInformation.vue

@@ -51,7 +51,7 @@ export default {
           columnProp: 'rejectFlagDesc',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '是否被驳回',
+          columnLabel: '是否驳回',
           columnHidden: false,
           columnImage: false,
           status: true,
@@ -113,6 +113,17 @@ export default {
           fixed: '',
           columnWidth: 300
         },
+        {
+          columnProp: 'processInterventionFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '流程干预',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
       ],
       searchDataList: [],
     }

src/views/modules/part/partInformation.vue

@@ -195,8 +195,9 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item prop="umId" :rules="rules.umId">
-                <span style="cursor: pointer" slot="label" @click="getBaseList(1007)"><a herf="#">计量单位 / Inventory UoM</a></span>
-                <el-input v-model="modalData.umId" @change="umIdBlur(1007)" style="width: 128px"></el-input>
+                <span v-if="modalData.flag === '2' && modalData.status === 'Y'" slot="label">计量单位 / Inventory UoM</span>
+                <span v-else style="cursor: pointer" slot="label" @click="getBaseList(1007)"><a herf="#">计量单位 / Inventory UoM</a></span>
+                <el-input v-model="modalData.umId" :disabled="modalData.flag === '2' && modalData.status === 'Y'" @change="umIdBlur(1007)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.umName" disabled style="width: 327px"></el-input>
               </el-form-item>
               <el-form-item>

src/views/modules/project/projectInfo/com_project_info_part.vue

@@ -118,8 +118,9 @@
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
               <el-form-item prop="umName" :rules="rules.umName">
-                <span style="cursor: pointer" slot="label" @click="getBaseList(1007)"><a herf="#">计量单位 / Inventory UoM</a></span>
-                <el-input v-model="modalData.umId" @change="umIdBlur(1007)" style="width: 128px"></el-input>
+                <span v-if="modalData.flag === '2' && modalData.status === 'Y'" slot="label">计量单位 / Inventory UoM</span>
+                <span v-else style="cursor: pointer" slot="label" @click="getBaseList(1007)"><a herf="#">计量单位 / Inventory UoM</a></span>
+                <el-input v-model="modalData.umId" :disabled="modalData.flag === '2' && modalData.status === 'Y'" @change="umIdBlur(1007)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.umName" disabled style="width: 330px"></el-input>
               </el-form-item>
               <el-form-item>