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

src/BIZComponents/inventoryTable.vue

@@ -123,7 +123,7 @@
       <template v-slot:entrustedEnterpriseId="scope">
         <el-form-item prop="entrustedEnterpriseId">
           <el-select
-            v-model="scope.row['entrustedEnterpriseId']"
+            v-model="scope.row.entrustedEnterpriseId"
             clearable
             filterable
           >
@@ -2014,9 +2014,9 @@ export default {
                 : '';
           }
           item.entrustedEnterpriseIdList = supplierObj[item.productId];
-          if (supplierObj[item.productId]?.length === 1) {
-            item.entrustedEnterpriseId = supplierObj[item.productId][0].id;
-          }
+          // if (supplierObj[item.productId]?.length === 1) {
+          //   item.entrustedEnterpriseId = supplierObj[item.productId][0].id;
+          // }
           item['customerMark'] = item.customerMark || this.customerMark;
           item['arrivalWay'] = item.arrivalWay || 1;
 

src/views/salesServiceManagement/accessory/index.vue

@@ -34,7 +34,7 @@
           <el-link
             type="primary"
             v-if="
-              row.source == 0 && $hasPermission('eom:sparepartsapply:update')
+              row.source == 0 && $hasPermission('eom:sparepartsapply:update') &&!(row.approvalStatus === 1 || row.approvalStatus === 2)
             "
             :underline="false"
             @click="openEdit(row, 'edit')"

src/views/salesServiceManagement/components/info.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="type === 'view'" class="switch_left">
+    <div v-if="type === 'view'&&isSwitch&&form.aftertype==3" class="switch_left">
       <ul>
         <li
           v-for="item in tabOptions"
@@ -1423,6 +1423,10 @@ export default {
     demandList: {
       type: Array,
       default: () => []
+    },
+    isSwitch: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {
@@ -1666,6 +1670,7 @@ export default {
       return [];
     },
     async init(res) {
+      this.activeComp='main'
       let productDetail = res.productDetail ? res.productDetail : [];
       this.$set(this.form, 'tableList', productDetail);
       this.$set(this.form, 'orderCode', res.orderCode);
@@ -2010,42 +2015,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 // 选项卡样式
-.switch_left {
-  margin-bottom: 16px;
-  
-  ul {
-    display: flex;
-    list-style: none;
-    padding: 0;
-    margin: 0;
-    border-bottom: 1px solid #e4e7ed;
-    
-    li {
-      cursor: pointer;
-      margin-right: 2px;
-      position: relative;
-      
-      &.active {
-        color: #fff;
-        font-weight: 500;
-        
-        background-color: #1890ff;
-        &::after {
-          content: '';
-          position: absolute;
-          left: 0;
-          bottom: -1px;
-          width: 100%;
-          height: 2px;
-          background-color: #1890ff;
-        }
-      }
-      
-      &:hover {
-      }
-    }
-  }
-}
+
 
 :deep(.el-table__body .el-form-item__content) {
   margin-left: 0px !important;

src/views/salesServiceManagement/demandList/components/addDialog.vue

@@ -10,7 +10,7 @@
     append-to-body
     @close="handleClose"
   >
-    <info ref="infoRef" :demandList="demandList" :type="type"></info>
+    <info ref="infoRef" :demandList="demandList" :type="type" :isSwitch="true"></info>
     <SubmitDialog ref="submitRef" @savExit="savExit" />
     <dispatchDialog ref="dispatchRef" @savExit="savExit" />
     <process-submit-dialog