Browse Source

bug 修复

lilei 3 năm trước cách đây
mục cha
commit
651ee936db

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1655781362474
+  "version": 1655793714777
 }

+ 3 - 3
src/views/allocationManagement/storeTransferOut/basicInfoModal.vue

@@ -119,9 +119,9 @@ export default {
       })
     },
     // 调往对象名称 change
-    custChange (obj, row) {
-      this.form.putPersonSn = row && row.customerSn || undefined
-      this.form.putPersonName = row && row.customerName || undefined
+    custChange (obj) {
+      this.form.putPersonSn = obj && obj.key || undefined
+      this.form.putPersonName = obj.row && obj.row.customerName || undefined
     },
     // 调往对象  change
     putPersonTypeChange (e) {

+ 21 - 7
src/views/salesManagement/salesQuery/detail.vue

@@ -90,13 +90,23 @@
           </div>
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">
-            <a-badge count="急" v-if="isOwerEdit&&record.oosFlag == 1">
-              <div style="padding-right: 15px;">{{ text }}</div>
-            </a-badge>
-            <a-badge count="缺" v-else-if="!isOwerEdit&&(!record.currentStockQty || record.currentStockQty < record.qty)">
-              <div style="padding-right: 15px;">{{ text }}</div>
-            </a-badge>
-            <span v-else>{{ text }}</span>
+            <div v-if="detailData">
+              <div v-if="isOwerEdit">
+                <a-badge count="急" v-if="record.oosFlag == 1">
+                  <div style="padding-right: 15px;">{{ text }}</div>
+                </a-badge>
+                <span v-else>{{ text }}</span>
+              </div>
+              <div v-else>
+                <a-badge count="急" v-if="isAudit&&record.oosFlag == 1">
+                  <div style="padding-right: 15px;">{{ text }}</div>
+                </a-badge>
+                <a-badge count="缺" v-else-if="!isAudit&&(!record.currentStockQty || record.currentStockQty < record.qty)">
+                  <div style="padding-right: 15px;">{{ text }}</div>
+                </a-badge>
+                <span v-else>{{ text }}</span>
+              </div>
+            </div>
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -176,6 +186,10 @@ export default {
     isOwerEdit () {
       return this.detailData && this.detailData.salesBillSource == 'SALES'
     },
+    // 是否审核通过
+    isAudit () {
+      return this.detailData ? (this.detailData.billStatus == 'WAIT_OUT_WAREHOUSE' || this.detailData.billStatus == 'FINISH') : false
+    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },

+ 21 - 7
src/views/salesManagement/salesQuery/edit.vue

@@ -135,13 +135,23 @@
           </div>
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">
-            <a-badge count="急" v-if="isOwerEdit&&record.oosFlag == 1">
-              <div style="padding-right: 15px;">{{ text }}</div>
-            </a-badge>
-            <a-badge count="缺" v-else-if="!isOwerEdit&&(!record.currentStockQty || record.currentStockQty < record.qty)">
-              <div style="padding-right: 15px;">{{ text }}</div>
-            </a-badge>
-            <span v-else>{{ text }}</span>
+            <div v-if="detailData">
+              <div v-if="isOwerEdit">
+                <a-badge count="急" v-if="record.oosFlag == 1">
+                  <div style="padding-right: 15px;">{{ text }}</div>
+                </a-badge>
+                <span v-else>{{ text }}</span>
+              </div>
+              <div v-else>
+                <a-badge count="急" v-if="isAudit&&record.oosFlag == 1">
+                  <div style="padding-right: 15px;">{{ text }}</div>
+                </a-badge>
+                <a-badge count="缺" v-else-if="!isAudit&&(!record.currentStockQty || record.currentStockQty < record.qty)">
+                  <div style="padding-right: 15px;">{{ text }}</div>
+                </a-badge>
+                <span v-else>{{ text }}</span>
+              </div>
+            </div>
           </template>
           <!-- 售价 -->
           <template slot="price" slot-scope="text, record">
@@ -264,6 +274,10 @@ export default {
     isOwerEdit () {
       return this.detailData && this.detailData.salesBillSource == 'SALES'
     },
+    // 是否审核通过
+    isAudit () {
+      return this.detailData && (this.detailData.billStatus == 'WAIT_OUT_WAREHOUSE' || this.detailData.billStatus == 'FINISH')
+    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },