优化单据，增加退货单的链接和列表提示

2022-11-17 22:50:37 +08:00 · 2022-11-17 22:50:37 +08:00 · 3df276db21
commit 3df276db21
parent 88985562aa
13 changed files with 53 additions and 81 deletions
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@ -176,15 +176,7 @@
            align:"center", width: 150,
            scopedSlots: { customRender: 'action' },
          },
-          { title: '单据编号', dataIndex: 'number',width:160,
-            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
-            }
-          },
+          { title: '单据编号', dataIndex: 'number',width:160},
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
            customRender:function (text,record,index) {
              if(text) {
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@ -176,15 +176,7 @@
            align:"center", width: 150,
            scopedSlots: { customRender: 'action' },
          },
-          { title: '单据编号', dataIndex: 'number',width:160,
-            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
-            }
-          },
+          { title: '单据编号', dataIndex: 'number',width:160},
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
            customRender:function (text,record,index) {
              if(text) {
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@ -176,15 +176,7 @@
            align:"center", width: 150,
            scopedSlots: { customRender: 'action' },
          },
-          { title: '单据编号', dataIndex: 'number',width:160,
-            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
-            }
-          },
+          { title: '单据编号', dataIndex: 'number',width:160},
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
            customRender:function (text,record,index) {
              if(text) {
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@ -193,15 +193,7 @@
            scopedSlots: { customRender: 'action' },
          },
          { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
-          { title: '单据编号', dataIndex: 'number',width:160,
-            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
-            }
-          },
+          { title: '单据编号', dataIndex: 'number',width:160},
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
            customRender:function (text,record,index) {
              if(text) {
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@ -193,15 +193,7 @@
            scopedSlots: { customRender: 'action' },
          },
          { title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
-          { title: '单据编号', dataIndex: 'number',width:160,
-            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
-            }
-          },
+          { title: '单据编号', dataIndex: 'number',width:160},
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
            customRender:function (text,record,index) {
              if(text) {
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@ -205,11 +205,8 @@
          { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
          { title: '单据编号', dataIndex: 'number',width:160,
            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
+              text = record.linkNumber?text+"[转]":text
+              return text
            }
          },
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@ -221,11 +221,9 @@
          { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
          { title: '单据编号', dataIndex: 'number',width:160,
            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[订]";
-              } else {
-                return text;
-              }
+              text = record.linkNumber?text+"[订]":text
+              text = record.hasBackFlag?text+"[退]":text
+              return text
            }
          },
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@ -185,11 +185,8 @@
          { title: '供应商', dataIndex: 'organName',width:120, ellipsis:true},
          { title: '单据编号', dataIndex: 'number',width:160,
            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
+              text = record.linkNumber?text+"[转]":text
+              return text
            }
          },
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@ -205,11 +205,8 @@
          { title: '会员', dataIndex: 'organName',width:120, ellipsis:true},
          { title: '单据编号', dataIndex: 'number',width:160,
            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
+              text = record.linkNumber?text+"[转]":text
+              return text
            }
          },
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@ -199,11 +199,8 @@
          { title: '会员', dataIndex: 'organName',width:120, ellipsis:true},
          { title: '单据编号', dataIndex: 'number',width:160,
            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
+              text = record.hasBackFlag?text+"[退]":text
+              return text
            }
          },
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@ -205,11 +205,8 @@
          { title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
          { title: '单据编号', dataIndex: 'number',width:160,
            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[转]";
-              } else {
-                return text;
-              }
+              text = record.linkNumber?text+"[转]":text
+              return text
            }
          },
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@ -221,11 +221,9 @@
          { title: '客户', dataIndex: 'organName',width:120, ellipsis:true},
          { title: '单据编号', dataIndex: 'number',width:160,
            customRender:function (text,record,index) {
-              if(record.linkNumber) {
-                return text + "[订]";
-              } else {
-                return text;
-              }
+              text = record.linkNumber?text+"[订]":text
+              text = record.hasBackFlag?text+"[退]":text
+              return text
            }
          },
          { title: '商品信息', dataIndex: 'materialsList',width:220, ellipsis:true,
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@ -95,6 +95,13 @@
                    {{model.accountName}}
                  </a-form-item>
                </a-col>
+                <a-col v-if="model.hasBackFlag" :lg="24" :md="6" :sm="6">
+                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退货单号">
+                    <template v-for="(item, index) in linkNumberList">
+                      <a @click="myHandleDetail(item.number)">{{item.number}}</a><br/>
+                    </template>
+                  </a-form-item>
+                </a-col>
              </a-row>
            </a-col>
          </a-row>
@ -346,6 +353,15 @@
                {{model.debt}}
              </a-form-item>
            </a-col>
+            <a-col v-if="model.hasBackFlag" :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退货单号">
+                <template v-for="(item, index) in linkNumberList">
+                  <a @click="myHandleDetail(item.number)">{{item.number}}</a><br/>
+                </template>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row class="form-row" :gutter="24">
            <a-col v-if="financialBillNoList.length" :span="6">
              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单号">
                <template v-for="(item, index) in financialBillNoList">
@ -608,7 +624,13 @@
                {{model.debt}}
              </a-form-item>
            </a-col>
-            <a-col :span="6"></a-col>
+            <a-col v-if="model.hasBackFlag" :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="退货单号">
+                <template v-for="(item, index) in linkNumberList">
+                  <a @click="myHandleDetail(item.number)">{{item.number}}</a><br/>
+                </template>
+              </a-form-item>
+            </a-col>
          </a-row>
          <a-row class="form-row" :gutter="24">
            <a-col :span="6">
@ -1003,6 +1025,7 @@
        billPrintFlag: false,
        fileList: [],
        purchaseBySaleFlag: false,
+        linkNumberList: [],
        financialBillNoList: [],
        tableWidth: {
          'width': '1500px'
@ -1415,6 +1438,13 @@
          }
        })
      },
+      getBillListByLinkNumber(number) {
+        getAction('/depotHead/getBillListByLinkNumber', {number: number}).then(res => {
+          if(res && res.code === 200){
+            this.linkNumberList = res.data
+          }
+        })
+      },
      getFinancialBillNoByBillId(billId) {
        getAction('/accountHead/getFinancialBillNoByBillId', {billId: billId}).then(res => {
          if(res && res.code === 200){
@ -1453,6 +1483,7 @@
        this.requestSubTableData(record, type, url, params);
        this.initPlatform()
        this.getSystemConfig()
+        this.getBillListByLinkNumber(this.model.number)
        this.getFinancialBillNoByBillId(this.model.id)
      },
      requestSubTableData(record, type, url, params, success) {