浏览代码

订单数据-关联委外弹窗增加销售信息

jbb 2 年之前
父节点
当前提交
124e0dff38
共有 2 个文件被更改,包括 82 次插入1 次删除
  1. 1 0
      src/views/order/manualModal.vue
  2. 81 1
      src/views/order/subcontractOrderModal.vue

+ 1 - 0
src/views/order/manualModal.vue

@@ -266,6 +266,7 @@
         handleExportXls(record){
            this.$refs.subcontractOrderModal.subcontractOrderModVis = true
            this.$refs.subcontractOrderModal.fatherList = record
+           this.$refs.subcontractOrderModal.manualData.push(record)
         },
         //删行
         handleDelete(record,index){

+ 81 - 1
src/views/order/subcontractOrderModal.vue

@@ -57,6 +57,20 @@
                  </span>
 
               </a-table>
+
+              <div class="purchase-order-table" style="margin-top: 2%;margin-bottom: 1%;">
+              <h6 class="table-title">销售订单信息</h6>
+              <a-table
+                :row-key="record => record.id"
+                :loading="loading"
+                :columns="manualColumns"
+                :data-source="manualData"
+                :scroll="{ y: 200 }"
+                bordered
+                :pagination="false"
+              >
+              </a-table>
+              </div>
           </a-spin>
         </a-card>
   
@@ -104,6 +118,7 @@
         subcontractOrderModVis:false,
         confirmLoading: false,
         subcontractOrderData:[ ],
+        manualData:[],
         subcontractOrderColumns:[
         {
           title: '委外订单号',
@@ -148,6 +163,70 @@
           ellipsis: true
         },
         ],
+        manualColumns:[
+        {
+          title: '销售订单账套号',
+          width: 110,
+          dataIndex: 'account',
+          className: 'replacecolor',
+          ellipsis: true
+        },
+        {
+          title: '销售订单号',
+          width: 110,
+          dataIndex: 'orderNumber',
+          className: 'replacecolor',
+          ellipsis: true
+        },
+        {
+          title: '销售订单行信息',
+          width: 110,
+          dataIndex: 'irowNo',
+          className: 'replacecolor',
+          ellipsis: true
+        },
+        {
+          title: '存货编码',
+          width: 120,
+          dataIndex: 'inventoryCode',
+          className: 'replacecolor',
+          ellipsis: true
+        },
+        {
+          title: '存货名称',
+          width: 190,
+          dataIndex: 'inventoryName',
+          className: 'replacecolor',
+        },
+        {
+          title: '规格型号',
+          width: 120,
+          dataIndex: 'specificationAndModel',
+          className: 'replacecolor',
+          ellipsis: true
+        },
+        {
+          title: '颜色',
+          width: 80,
+          dataIndex: 'colour',
+          className: 'replacecolor',
+          ellipsis: true
+        },
+        {
+          title: '委外订单号',
+          width: 120,
+          dataIndex: 'ccode',
+          className: 'replacecolor',
+          ellipsis: true
+        },
+        {
+          title: '委外订单行号',
+          width: 120,
+          dataIndex: 'ivouchRowNo',
+          className: 'replacecolor',
+          ellipsis: true
+        },
+        ],
         selectedRowKeys:[],
         selectedRows:[],
         fatherList:'',
@@ -197,7 +276,7 @@
         },
         //返回
         handleCancel(){
-          this.close
+          this.close()
         },
         //保存
         addSave(){
@@ -216,6 +295,7 @@
           this.subcontractOrderData = []
           this.queryParam={}
           this.selectedRowKeys = []
+          this.manualData = []
         },
         //选中行
         onSelectChange(keys,rows){