Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/api/reportForms/supply-capacity-table.js

@@ -5,7 +5,7 @@ import { getAction } from '@/api/manage'
 const supplyCapList = params => getAction('/scas/supplierCapacity/list', params)
 
 //合并导出
-const handleXls = params => getAction('/scas/supplierCapacity/excel98888888888', params)
+const handleXls = params => getAction('/scas/supplierCapacity/excel1', params)
 
 //月份供应商合计导出
 const monthSupplyXls = params => getAction('/scas/supplierCapacity/excel3', params)

src/views/reportForms/supply-capacity-table.vue

@@ -37,12 +37,7 @@
             <template v-if="toggleSearchStatus">
               <a-col :md="6" :sm="8">
                 <a-form-item label="订单类型">
-                  <a-select placeholder="请选择订单类型" v-model="queryParam.iOrderType">
-                    <a-select-option :value="''">请选择</a-select-option>
-                    <a-select-option :value="0">订单类型1</a-select-option>
-                    <a-select-option :value="1">订单类型2</a-select-option>
-                    <a-select-option :value="2">订单类型3</a-select-option>
-                  </a-select>
+                  <a-input placeholder="请输入订单类型" v-model="queryParam.iOrderType"></a-input>
                 </a-form-item>
               </a-col>
 
@@ -184,7 +179,7 @@ export default {
         iOrderType: '',
         cVenCode: '',
         cPlanLotNumber: '',
-        pageNo: '', // 当前页
+        pageNo: '' // 当前页
       },
       // 分页
       pagination: {
@@ -223,32 +218,20 @@ export default {
     //合并导出
     handleExportXls() {
       handleXls().then(res => {
-        console.log('000')
-        if (res.success) {
-          console.log('月份供应链合计导出', res.result)
-          console.log('请求接口成功')
-        }
+        console.log('合并导出ok')
       })
     },
 
     // 月份供应链合计导出
     monthSupplyExport() {
       monthSupplyXls().then(res => {
-        console.log('000')
-        if (res.success) {
-          console.log('月份供应链合计导出', res.result)
-          console.log('请求接口成功')
-        }
+        console.log('月份供应链合计导出ok')
       })
     },
     // 月份部门合计导出
     monthDepartExport() {
       monthDepartXls().then(res => {
-        console.log('000')
-        if (res.success) {
-          console.log('月份供应链合计导出', res.result)
-          console.log('请求接口成功')
-        }
+        console.log('月份部门合计导出ok')
       })
     },
 

src/views/shipment-details/addShipDetDrawer.vue

@@ -118,7 +118,7 @@
       <a-card :bordered="true" style="margin:10px 0">
         <div class="table-operator">
           <a-button type="primary" @click.stop="referOrderDataOpen" icon="ordered-list">参照订单数据</a-button>
-          <a-button type="primary" @click.stop="handleAddColumn" icon="plus" style="margin-left: 20px">増行</a-button>
+          <!-- <a-button type="primary" @click.stop="handleAddColumn" icon="plus" style="margin-left: 20px">増行</a-button> -->
         </div>
 
         <!-- 子表  :model="form"  rowKey="id" ,y:800 -->
@@ -345,7 +345,12 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-
+        {
+          title: '订单主表ID',
+          dataIndex: 'syOrderDataId',
+          width: 80,
+          className: 'replacecolor'
+        },
         {
           title: '客户订单',
           dataIndex: 'customerOrder',
@@ -635,7 +640,7 @@ export default {
 
   methods: {
     getSon(val) {
-      console.log('勾选订单数据', val)
+      // console.log('勾选订单数据', val)
       for (var i in val) {
         val[i]['orderQuantity'] = val[i].quantity
         val[i]['orderRemainingQuantity'] = val[i].surplusNum
@@ -649,10 +654,10 @@ export default {
     // 参照订单数据
     referOrderDataOpen() {
       this.$refs.referOrderDataModal.referOrderDataModVis = true
-      console.log('点击参照订单数据')
+      // console.log('点击参照订单数据')
     },
-    // 新增 保存
 
+    // 新增 保存
     addSave() {
       var newObj = {} // 新增对象
       newObj.documentNo = this.addShipDet.documentNo
@@ -660,22 +665,12 @@ export default {
       newObj.customer = this.addShipDet.customer
       newObj.preDeliveryDate = this.addShipDet.preDeliveryDate.format('YYYY-MM-DD') // 预发货日期
       newObj.preCompletionDate = this.addShipDet.preCompletionDate.format('YYYY-MM-DD') // 预完工日期
-      // 2022-06-10 增加的字段
-      // newObj.packId = this.addShipDet.packId
-      // newObj.distributionPoint = this.addShipDet.distributionPoint
-      // newObj.todo = this.addShipDet.todo //数量（合计）
-      // newObj.salesUnitPrice = this.addShipDet.salesUnitPrice
-      // newObj.purOrSubOrder = this.addShipDet.purOrSubOrder
       newObj.orderType = this.addShipDet.orderType
-      // newObj.factoryUnitPrice = this.addShipDet.factoryUnitPrice
-      // newObj.declarationElements = this.addShipDet.declarationElements
-      // newObj.numberOfSets = this.addShipDet.numberOfSets
       newObj.chineseName = this.addShipDet.chineseName
       newObj.englishProductName = this.addShipDet.englishProductName
       newObj.garmentFactory = this.addShipDet.garmentFactory
       newObj.hsCode = this.addShipDet.hsCode
       newObj.declarationName = this.addShipDet.declarationName
-      // newObj.customsDeclarationUnitPrice = this.addShipDet.customsDeclarationUnitPrice
       newObj.wholeOrderTotal = this.addShipDet.wholeOrderTotal
       newObj.memo = this.addShipDet.memo // U8系统适用
       newObj.syShippingDetailsItemList = this.syShippingDetailsItemList // 子表信息赋值
@@ -705,44 +700,44 @@ export default {
     },
 
     // 増行
-    handleAddColumn() {
-      console.log('増行')
-      const addrow = {
-        accountSet: '',
-        documentNo: '',
-        itemNumber: '',
-        orderDate: '',
-        businessType: '',
-        customerOrder: '',
-        smallPo: '',
-        packId: '',
-        orderDate: '',
-        orderRemaQuantity: '',
-        shipQuantity: '',
-        isTC: '',
-        materialComposition: '',
-        saleType: '',
-        customerShortName: '',
-        customerName: '',
-        exchangeRate: '',
-        wholeSingleCombined: '',
-        salesDepartment: '',
-        salesman: '',
-        currency: '',
-        brand: '',
-        thirdParty: '',
-        depositRate: '',
-        deposit: '',
-        collaborativeRoute: '',
-        paymentClause: '',
-        finalCustomer: '',
-        orderNote: '',
-        priceNote: '',
-        orderChangeDesc: '',
-        operation: ''
-      }
-      this.syShippingDetailsItemList.push(addrow)
-    },
+    // handleAddColumn() {
+    //   console.log('増行')
+    //   const addrow = {
+    //     accountSet: '',
+    //     documentNo: '',
+    //     itemNumber: '',
+    //     orderDate: '',
+    //     businessType: '',
+    //     customerOrder: '',
+    //     smallPo: '',
+    //     packId: '',
+    //     orderDate: '',
+    //     orderRemaQuantity: '',
+    //     shipQuantity: '',
+    //     isTC: '',
+    //     materialComposition: '',
+    //     saleType: '',
+    //     customerShortName: '',
+    //     customerName: '',
+    //     exchangeRate: '',
+    //     wholeSingleCombined: '',
+    //     salesDepartment: '',
+    //     salesman: '',
+    //     currency: '',
+    //     brand: '',
+    //     thirdParty: '',
+    //     depositRate: '',
+    //     deposit: '',
+    //     collaborativeRoute: '',
+    //     paymentClause: '',
+    //     finalCustomer: '',
+    //     orderNote: '',
+    //     priceNote: '',
+    //     orderChangeDesc: '',
+    //     operation: ''
+    //   }
+    //   this.syShippingDetailsItemList.push(addrow)
+    // },
     // --------------------------------------
     // 操作 删除
     handleDelete(index) {
@@ -751,7 +746,10 @@ export default {
       return this.syShippingDetailsItemList.splice(index, 1)
     },
     // 操作 复制 复制一行已有的数据
-    copy(record) {},
+    copy(record) {
+      console.log('复制的数据', record)
+      this.syShippingDetailsItemList.push(record)
+    },
     // --------------------------------------
     // 抽屉 取消
     handleCancel() {

src/views/shipment-details/shipmentList.vue

@@ -406,12 +406,6 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        {
-          title: '英文品名',
-          dataIndex: 'englishName',
-          width: 120,
-          className: 'replacecolor'
-        },
 
         {
           title: '成衣工厂',