Browse Source

异常管理新需求

cz 1 year ago
parent
commit
cbf15006b5

+ 3 - 1
src/components/WDLY/process/SendPurchaseWDLY.vue

@@ -610,7 +610,9 @@ const handleChangeAmount = () => {
 };
 
 const handleChangeMoney = (val, index, key) => {
-  formData.data.purchaseDetailList[index][key] = val;
+  if (key) {
+    formData.data.purchaseDetailList[index][key] = val;
+  }
   for (let i = 0; i < formData.data.purchaseDetailList.length; i++) {
     formData.data.purchaseDetailList[i].amount = parseFloat(
       formData.data.purchaseDetailList[i].count *

+ 54 - 2
src/views/WDLY/outInBound/abnormal/index.vue

@@ -174,6 +174,12 @@
                             prop="quantity"
                             width="100"
                           />
+                          <el-table-column
+                            label="是否有次品"
+                            prop="isReject"
+                            width="100"
+                            :formatter="(row) => (row.isReject ? '是' : '否')"
+                          />
                         </el-table>
                       </div>
                       <template #reference>
@@ -214,7 +220,46 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="qualityQuantity" label="已质检数量" />
+              <el-table-column prop="qualityQuantity" label="已质检数量">
+                <template #default="{ row }">
+                  <div>
+                    <el-popover
+                      placement="bottom-start"
+                      title="质检记录"
+                      :width="500"
+                      trigger="hover"
+                    >
+                      <div default>
+                        <el-table :data="row.qualityDetailsList">
+                          <el-table-column
+                            prop="createTime"
+                            label="质检时间"
+                            width="155"
+                          />
+                          <el-table-column
+                            prop="qualifiedCount"
+                            label="合格数量"
+                          />
+                          <el-table-column
+                            prop="noQualifiedCount"
+                            label="不合格数量"
+                          />
+                          <el-table-column
+                            prop="createUserName"
+                            label="质检人"
+                            width="120"
+                          />
+                        </el-table>
+                      </div>
+                      <template #reference>
+                        <div style="cursor: pointer; color: #0084ff">
+                          {{ row.qualityQuantity }}
+                        </div>
+                      </template>
+                    </el-popover>
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column prop="noQualifiedCount" label="不合格数量" />
             </el-table>
           </div>
@@ -348,6 +393,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "物流单号",
+        prop: "logisticsCode",
+        width: 160,
+      },
+    },
+    {
+      attrs: {
         label: "异常说明",
         prop: "title",
       },
@@ -402,7 +454,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "操作",
-        width: "200",
+        width: "160",
         align: "right",
       },
       // 渲染 el-button,一般用在最后一列。

+ 0 - 2
src/views/WDLY/purchaseManage/arrival/index.vue

@@ -159,8 +159,6 @@
         :formConfig="formConfigOne"
         :formOption="formOptionOne"
         v-model="formData.dataOne"
-        :rules="rules"
-        ref="byformOne"
       >
         <template #products>
           <div style="width: 100%">