【修改】调整

src/views/basic_data/warehouse/warehouse_site.vue

@@ -76,9 +76,11 @@
           <el-table-column align="left" label="仓位名称" prop="kingDeeStocks" min-width="400" show-overflow-tooltip>
             <template slot-scope="scope">
               <template v-if="scope.row.kingDeeStocks.length > 0">
-                <el-tag size="mini" type="danger" style="margin-right: 10px" v-for="item in scope.row.kingDeeStocks">
-                  {{ item.name }}
-                </el-tag>
+                <template v-for="item in scope.row.kingDeeStocks">
+                  <el-tag size="mini" type="danger" style="margin-right: 10px" :key="item" v-if="item">
+                    {{ item?item.name :''}}
+                  </el-tag>
+                </template>
               </template>
             </template>
           </el-table-column>

src/views/supply/deliver/sum_list.vue

@@ -663,6 +663,14 @@
             />
             <el-table-column
               align="left"
+              label="金蝶部门"
+              prop="k3OrgName"
+              min-width="120"
+              show-overflow-tooltip
+              sortable
+            />
+            <el-table-column
+              align="left"
               label="文件编号"
               sortable
               prop="itemFileNo"

src/views/supply/engin/components/engin_form.vue

@@ -860,8 +860,9 @@ export default {
       delItem({
         enginInfoNo: row.enginInfoNo,
         itemId: row.id
+      }).then(res =>{
+        this.goodsList.splice(index, 1)
       })
-      this.goodsList.splice(index, 1)
     },
 
     // 导入产品

src/views/supply/engin/components/home_form.vue

@@ -494,7 +494,8 @@
           <el-table-column align="center" label="" width="100">
             <template slot-scope="scope">
               <el-button type="primary" size="small" @click="chooseItem(scope.row.recordNo, scope.row.userid)"
-                >选择</el-button
+              >选择
+              </el-button
               >
             </template>
           </el-table-column>
@@ -734,11 +735,15 @@ export default {
       const STOCK_ORDER_HAVE_START = that.stockList.find(o => o.dictCode == 'STOCK_ORDER_HAVE_START').dictValue
       const STOCK_ORDER_HAVE_END = that.stockList.find(o => o.dictCode == 'STOCK_ORDER_HAVE_END').dictValue
       const STOCK_ORDER_ALL_NUM = that.stockList.find(o => o.dictCode == 'STOCK_ORDER_ALL_NUM').dictValue
-      if (val === '' || val === null || val === undefined) return '未检查'
-      else if (val <= 0) return '无货'
-      else if (val > STOCK_ORDER_START && val <= STOCK_ORDER_END) return val
-      else if (val >= STOCK_ORDER_HAVE_START && val <= STOCK_ORDER_HAVE_END) return '有货'
-      else if (val > STOCK_ORDER_ALL_NUM) return '充足'
+      if (val === '' || val === null || val === undefined) {
+        return '未检查'
+      } else if (val <= 0) {
+        return '无货'
+      } else if (val > STOCK_ORDER_START && val <= STOCK_ORDER_END) {
+        return val
+      } else if (val >= STOCK_ORDER_HAVE_START && val <= STOCK_ORDER_HAVE_END) {
+        return '有货'
+      } else if (val > STOCK_ORDER_ALL_NUM) return '充足'
     }
   },
   props: ['listItem'],
@@ -909,7 +914,7 @@ export default {
       immediate: true,
       deep: true
     },
-    'mainForm.saleType': function (newValue, oldValue) {
+    'mainForm.saleType': function(newValue, oldValue) {
       this.oldSaleType = oldValue
     }
   },
@@ -1005,7 +1010,8 @@ export default {
         projectName: this.screenForm.enginName,
         useUnit: this.screenForm.company,
         refEnginRecordNo: this.mainForm.loginNum,
-        examineStatus: 'OK'
+        examineStatus: 'OK',
+        isClose: true
       }).then(res => {
         this.dialogTable_dataList = res.data.records
         this.dialogTable_listTotal = res.data.total
@@ -1439,8 +1445,9 @@ export default {
     },
 
     status2Filter(item) {
-      if (item.status2 === '' || item.status2 === null || item.status2 === undefined) return '未检查'
-      else if (item.status2 <= 0) return '无货'
+      if (item.status2 === '' || item.status2 === null || item.status2 === undefined) {
+        return '未检查'
+      } else if (item.status2 <= 0) return '无货'
       if (item.status2 <= 0) {
         return '无货'
       } else if (item.status2 >= 1 && item.status2 <= 30) {
@@ -1729,10 +1736,12 @@ export default {
 ::v-deep .input .el-input__inner {
   color: blue;
 }
+
 .detail-container {
   width: 100%;
   height: 100%;
 }
+
 .main-title {
   display: flex;
   justify-content: space-between;
@@ -1741,24 +1750,29 @@ export default {
   height: 60px;
   border-bottom: 1px solid #dcdfe6;
   margin-bottom: 20px;
+
   .title {
     font-size: 16px;
     font-weight: 600;
     padding-left: 10px;
   }
 }
+
 .tables {
   display: flex;
   margin-top: 10px;
+
   .table {
     width: 45%;
   }
+
   .buttons {
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
     padding: 0 10px;
+
     button {
       margin: 0;
       margin-top: 10px;
@@ -1770,6 +1784,7 @@ export default {
 ::v-deep input::-webkit-inner-spin-button {
   -webkit-appearance: none;
 }
+
 ::v-deep input[type='number'] {
   -moz-appearance: textfield;
 }

src/views/supply/engin/engin_list.vue

@@ -622,7 +622,6 @@ export default {
       this.listLoading = true
 
       const params = {
-        isClose: true,
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         enginInfoNo: this.screenForm.orderNum,

src/views/supply/implement/nsales_list.vue

@@ -456,6 +456,22 @@
               show-overflow-tooltip
               sortable
             />
+            <el-table-column
+              align="left"
+              label="金蝶部门"
+              prop="k3OrgName"
+              min-width="120"
+              show-overflow-tooltip
+              sortable
+            />
+            <el-table-column
+              align="left"
+              label="钱包"
+              prop="customerWalletName"
+              min-width="100"
+              show-overflow-tooltip
+              sortable
+            />
             <!-- <el-table-column align="center" label="操作" width="120" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>