Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/BOMmanage/components/detailedList.vue

@@ -66,6 +66,11 @@
           placeholder="请输入"
           size="mini"
           style="width: 90px"
+          :disabled="
+            attributeData.approvalStatus == 1 ||
+            attributeData.approvalStatus == 2 ||
+            isWt
+          "
           @input="handleInput(row)"
         >
         </el-input>

src/views/material/BOMmanage/index.vue

@@ -36,6 +36,15 @@
             </el-link>
           </template>
 
+          <template v-slot:code="{ row }">
+            <el-link
+              type="primary"
+              :underline="false"
+              @click="handelDetail(row)"
+              >{{ row.code }}</el-link
+            >
+          </template>
+
           <template v-slot:versions="{ row }"> V{{ row.versions }}.0 </template>
           <template v-slot:isTemp="{ row }">
             <el-tag size="mini" v-if="row.isTemp == 1">主数据</el-tag>
@@ -87,7 +96,7 @@
 
           <!-- 表头工具栏 -->
           <template v-slot:action="{ row }">
-            <el-link type="primary" @click="handelDetail(row)">详情</el-link>
+            <!-- <el-link type="primary" @click="handelDetail(row)">详情</el-link> -->
 
             <el-link
               v-if="
@@ -100,7 +109,10 @@
               >发布</el-link
             >
             <el-link
-              v-if="row.approvalStatus == 1 && $hasPermission('main:bomcategory:withdraw')"
+              v-if="
+                row.approvalStatus == 1 &&
+                $hasPermission('main:bomcategory:withdraw')
+              "
               type="primary"
               @click="handWithdraw(row)"
               >撤回</el-link
@@ -481,7 +493,12 @@
         const params = {
           processInstanceId: row.processInstanceId,
           businessId: row.id,
-          processDefinitionKey: this.clientEnvironmentId == 5 ? this.radioSubmit == 1 ? 'bom_release' : 'bom_release_device' : 'bom_approver'
+          processDefinitionKey:
+            this.clientEnvironmentId == 5
+              ? this.radioSubmit == 1
+                ? 'bom_release'
+                : 'bom_release_device'
+              : 'bom_approver'
         };
         this.$confirm('是否确认撤回?', '提示', {
           confirmButtonText: '确定',
@@ -489,19 +506,18 @@
           type: 'warning'
         })
           .then(() => {
-            withdrawBom(params).then((res) => {
-              if (res?.code == '0') {
-                this.$message.success('撤回成功');
-                this.reload();
-              }
-            }).catch((err) => {
-              // this.$message.error(err.message);
-            });
+            withdrawBom(params)
+              .then((res) => {
+                if (res?.code == '0') {
+                  this.$message.success('撤回成功');
+                  this.reload();
+                }
+              })
+              .catch((err) => {
+                // this.$message.error(err.message);
+              });
           })
-          .catch(() => {
-      
-          });
-        
+          .catch(() => {});
       },
       handSubmit(row) {
         this.currentNodeData = row;
@@ -583,7 +599,6 @@
         });
       },
       handelDetail(row) {
-        console.log(row.versions, 'row.versions');
         let rowData = {
           categoryId: row.categoryId,
           categoryName: row.categoryName,

src/views/technology/production/components/user-edit.vue

@@ -80,6 +80,20 @@
             <el-input v-model="form.sort" />
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="工序标签:" prop="processLabel">
+            <el-select v-model="form.processLabel" filterable>
+              <el-option
+                v-for="item in processLabeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="附件上传:" prop="sort">
             <!-- <fileUpload v-model="form.files"></fileUpload> -->
@@ -523,7 +537,7 @@
       WorkCenter,
       fileUpload
     },
-    props: {  
+    props: {
       // 弹窗是否打开
       visible: Boolean,
       // 修改回显的数据
@@ -545,6 +559,7 @@
           timeUnit: '',
           factoriesId: '',
           factoriesName: '',
+          processLabel: 1,
           feedNeedTurnover: '',
           reportNeedTurnover: '',
           reportNeedFeed: '',
@@ -642,7 +657,12 @@
         loading: false,
         // 是否是修改
         isUpdate: false,
-        chooseItem: null
+        chooseItem: null,
+        processLabeList: [
+          { id: 1, name: '自制' },
+          { id: 2, name: '委外' },
+          { id: 3, name: '请托' }
+        ]
       };
     },
     computed: {

src/views/technology/production/index.vue

@@ -81,6 +81,12 @@
           {{ typeLabel(row.type) }}
         </template>
 
+        <template v-slot:processLabel="{ row }">
+          <el-tag v-if="row.processLabel == 1">自制</el-tag>
+          <el-tag v-if="row.processLabel == 2">委外</el-tag>
+          <el-tag v-if="row.processLabel == 3">请托</el-tag>
+        </template>
+
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-link
@@ -244,6 +250,14 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            align: 'center',
+            prop: 'processLabel',
+            slot: 'processLabel',
+            label: '工序标签',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             align: 'center',
             prop: 'gui',