From efbfe1ccc54896561efa17b05edab83f4a59ead9 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 9 Jul 2024 18:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=A8=E5=BA=93=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=9A=84=20=E5=8C=85=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionStockArticleFrom.js           | 21 ++++----
 .../distributionStockArticleDetails.vue       | 54 ++++++++++++++-----
 .../distributionStockArticleFrom.vue          | 12 ++++-
 3 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/src/option/distribution/distributionStockArticleFrom.js b/src/option/distribution/distributionStockArticleFrom.js
index a363b284..c170a471 100644
--- a/src/option/distribution/distributionStockArticleFrom.js
+++ b/src/option/distribution/distributionStockArticleFrom.js
@@ -202,17 +202,16 @@ export default {
       fixed: false,
       sortable: true,
     },
-    // {
-    //   label: '状态',
-    //   prop: 'conditions',
-    //   search: true,
-    //   type: 2,
-    //   values: '',
-    //   width: '130',
-    //   checkarr: [],
-    //   fixed: false,
-    //   sortable: true,
-    // },
+    {
+      label: '物料维护状态',
+      prop: 'materialCodeMaintainStatus',
+      type: 6,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
     {
       label: '包条码',
       prop: 'orderPackageCode',
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 21a841cc..4a57d395 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -136,7 +136,11 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
+            <template v-if="slotProps.scope.column.label==='物料维护状态'">
+              <el-tag :class="slotProps.scope.row.materialId ? 'green' : 'red'">{{ slotProps.scope.row.materialCodeMaintainStatus }}</el-tag>
+            </template>
+            <template v-else-if="slotProps.scope.column.label==='操作'">
+              <!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
             <!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
             <el-text
               type="primary"
@@ -168,6 +172,7 @@
               @click="handleMaterial(slotProps.scope.row, '2')"
               >修改物料信息</el-text
             >
+            </template>
           </template>
         </tablecmt>
         <el-row>
@@ -624,6 +629,26 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'materialCode',
+          label: '物料编码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'materialCodeMaintainStatus',
+          label: '物料维护状态',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'quantity',
           label: '数量',
@@ -1404,17 +1429,22 @@ export default {
 
         this.page.total = data.total;
         this.dataPare = data.records;
-        this.dataPare.some(i => {
-          if (i.conditions == '1') {
-            i.conditions = '定制品';
-          } else {
-            i.conditions = '库存品';
-          }
-          if (!i.materialId) {
-            //有
-            this.dataMaterial = true;
-          }
-        });
+        for (let i = 0; i < this.dataPare.length; i++) {
+          const item = this.dataPare[i];
+          item.materialCodeMaintainStatus = item.materialId ? '已维护' : '未维护'
+        }
+        
+        // this.dataPare.some(i => {
+        //   if (i.conditions == '1') {
+        //     i.conditions = '定制品';
+        //   } else {
+        //     i.conditions = '库存品';
+        //   }
+        //   if (!i.materialId) {
+        //     //有
+        //     this.dataMaterial = true;
+        //   }
+        // });
         // this.loading = false;
         this.selectionClear();
       } catch (error) {
diff --git a/src/views/distribution/inventory/distributionStockArticleFrom.vue b/src/views/distribution/inventory/distributionStockArticleFrom.vue
index 89ab7423..de15311f 100644
--- a/src/views/distribution/inventory/distributionStockArticleFrom.vue
+++ b/src/views/distribution/inventory/distributionStockArticleFrom.vue
@@ -51,7 +51,11 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
+            <template v-if="slotProps.scope.column.label==='物料维护状态'">
+              <el-tag :class="slotProps.scope.row.materialId ? 'green' : 'red'">{{ slotProps.scope.row.materialCodeMaintainStatus }}</el-tag>
+            </template>
+            <template v-else-if="slotProps.scope.column.label==='操作'">
+              <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
               >查看</el-text
             >
             <el-text
@@ -61,6 +65,8 @@
               @click="handleCallDeliveryOwn(slotProps.scope)"
               >修改客户信息</el-text
             >
+            </template>
+
           </template>
         </tablecmt>
       </el-row>
@@ -133,6 +139,10 @@ export default {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
+          for (let i = 0; i < this.data.length; i++) {
+          const item = this.data[i];
+          item.materialCodeMaintainStatus = item.materialId ? '已维护' : '未维护'
+        }
           this.loading = false;
           this.selectionClear();
         });