单证-订单数据 查询条件 联调成功

src/api/document/shipmentList.js

@@ -40,6 +40,9 @@ const syDeclarationElementsAdd = params =>
 // 参照订单数据
 const queryOrderData = params => getAction('/shippingDetails/syShippingDetails/queryOrderData', params)
 
+// 维护款号成分
+const addItemNumEle = params => postAction('/shippingDetails/syShippingDetails/updateByTcNumberMaterial', params)
+
 export {
   shipmentList,
   addShipmentList,
@@ -52,5 +55,6 @@ export {
   syDeclarationElementsAdd,
   cancelSubmitShipment,
   pushShipment,
-  rePushShipment
+  rePushShipment,
+  addItemNumEle
 }

src/views/order/orderList.vue

@@ -225,7 +225,7 @@ export default {
         orderList(this.queryParam).then(res => {
           if (res.success) {
             this.orderListData = res.result.records
-            // console.log('订单数据列表', this.orderListData)
+            console.log('订单数据列表', this.orderListData)
             this.pagination = {
               total: res.result.total,
               current: res.result.current,

src/views/shipment-details/addShipDetDrawer.vue

@@ -108,7 +108,7 @@
               :columns="columns"
               :data-source="syShippingDetailsItemList"
               :pagination="false"
-              :scroll="{ x: 1500,y:500 }"
+              :scroll="{ x: 1500, y: 500 }"
               size="small"
             >
               <!-- 款号 输入框 :rules="rules.itemNumber" -->
@@ -610,7 +610,7 @@ export default {
         val[i]['orderRemainingQuantity'] = val[i].surplusNum
         val[i]['salesUnitPrice'] = val[i].unitPriceIncludingTax
         val[i]['customerOrder'] = val[i].customerOrderNumber
-        val[i]['shipmentQuantity'] = val[i].surplusNum //订单剩余数量 赋值给发货数量
+        val[i]['shipmentQuantity'] = val[i].surplusNum // 订单剩余数量 赋值给发货数量
       }
       this.msgFormSon = val
       this.syShippingDetailsItemList = this.msgFormSon
@@ -646,7 +646,7 @@ export default {
             this.$message.success('新增成功')
             console.log('新增的对象', newObj)
             this.close()
-            //清空信息
+            // 清空信息
             newObj = {}
             newObj.syShippingDetailsItemList = []
             this.fatherList() // 调用父组件 查询方法

src/views/shipment-details/itemNumEleModal.vue

@@ -0,0 +1,154 @@
+<template>
+  <!-- 维护款号成分 -- 发运明细 -->
+  <a-modal
+    title="维护款号成分"
+    v-model="itemNumEleModVis"
+    :confirmLoading="confirmLoading"
+    width="76%"
+    @ok="save"
+    @cancel="handleCancel"
+  >
+    <a-card :bordered="false">
+      <div class="table-page-search-wrapper">
+        <!-- :rules="validatorRules" -->
+        <a-form-model layout="inline" ref="form" :model="editItemNumber">
+          <a-row :gutter="24">
+            <a-col :md="6" :sm="8">
+              <!-- required 必填项 disabled 禁用  -->
+              <a-form-model-item label="款号" prop="itemNumber">
+                <a-input placeholder="请输入款号" v-model="editItemNumber.itemNumber"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="物料成分" prop="materialComposition">
+                <a-input placeholder="请输入物料成分" v-model="editItemNumber.materialComposition"></a-input>
+              </a-form-model-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="是否做TC证书" prop="isTc">
+                <a-select v-model="editItemNumber.isTc">
+                  <a-select-option value="">请选择</a-select-option>
+                  <a-select-option :value="1">是</a-select-option>
+                  <a-select-option :value="0">否</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+    </a-card>
+    <!-- 页面底部保存取消 -->
+    <div
+      :style="{
+        position: 'absolute',
+        right: 0,
+        bottom: 0,
+        width: '100%',
+        borderTop: '1px solid #e9e9e9',
+        padding: '10px 16px',
+        background: '#fff',
+        textAlign: 'right',
+        zIndex: 1
+      }"
+    >
+      <a-popconfirm title="确定放弃维护款号成分吗？" @confirm="handleCancel" okText="确定" cancelText="取消">
+        <a-button :style="{ marginRight: '8px' }">取消</a-button>
+      </a-popconfirm>
+      <a-button type="primary" @click="save">
+        保存
+      </a-button>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+
+import { addItemNumEle } from '@api/document/shipmentList'
+export default {
+  name: 'ItemNumEleModal', // 维护款号成分
+  mixins: [JeecgListMixin],
+  components: { JEllipsis },
+  data() {
+    return {
+      loading: false, // 表格加载
+      // orderDataform: this.$form.createForm(this),
+      confirmLoading: false,
+      itemNumEleModVis: false,
+      editItemNumber: {} // 维护款号成分
+    }
+  },
+  // 接收父组件 方法
+  // props: {
+  //   father: {
+  //     type: Function,
+  //     default: null
+  //   }
+  // },
+  created() {},
+  methods: {
+    save() {
+      console.log('点击了保存')
+      var newObj = {} // 维护款号成分对象
+      newObj.itemNumber = this.editItemNumber.itemNumber
+      newObj.materialComposition = this.editItemNumber.materialComposition
+      newObj.isTc = this.editItemNumber.isTc
+      console.log('00')
+      if (
+        this.editItemNumber.itemNumber === '' ||
+        this.editItemNumber.materialComposition === '' ||
+        this.editItemNumber.isTc === ''
+      ) {
+        console.log('11')
+        this.$message.error('请输入款号成分')
+      } else {
+        console.log('22')
+        addItemNumEle(newObj).then(res => {
+          console.log('newObj', newObj)
+          if (res.success) {
+            this.$message.success('维护款号成分成功')
+            console.log('款号成分对象', newObj)
+            console.log('33')
+            this.close()
+            // 清空信息
+            newObj = {}
+            newObj.editItemNumber = []
+            // this.fatherList() // 调用父组件 查询方法
+          }
+        })
+      }
+    },
+    // 取消
+    cancel() {
+      this.itemNumEleModVis = false
+      this.close()
+    },
+    handleCancel() {
+      this.close()
+    },
+    close() {
+      this.$emit('close')
+      this.itemNumEleModVis = false
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+@import '~@assets/less/overwriter.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+</style>

src/views/shipment-details/referOrderDataModal.vue

@@ -138,6 +138,13 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
+
+         {
+          title: '存货编码',
+          dataIndex: 'inventoryCode',
+          width: 220,
+          className: 'replacecolor'
+        },
         {
           title: '存货名称',
           dataIndex: 'inventoryName',
@@ -176,6 +183,12 @@ export default {
           className: 'replacecolor'
         },
 
+  {
+          title: '含税单价',
+          dataIndex: 'unitPriceIncludingTax',
+          width: 100,
+          className: 'replacecolor'
+        },
         {
           title: '含税单价',
           dataIndex: 'unitPriceIncludingTax',
@@ -436,7 +449,6 @@ export default {
       return {
         onChange: (selectedRowKeys, selectedRows) => {
           console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
-          
         },
         getCheckboxProps: record => ({
           props: {

src/views/shipment-details/shipmentList.vue

@@ -125,6 +125,10 @@
                 <a @click="edit(record)">编辑</a>
               </a-menu-item>
 
+              <a-menu-item>
+                <a href="javascript:void(0);" @click="itemNumberElement(record)">维护款号成分</a>
+              </a-menu-item>
+
               <a-menu-item>
                 <a-popconfirm title="确定提交吗?" ok-text="是" cancel-text="否" @confirm="submit(record)">
                   <a href="javascript:void(0);" style="color:green;">提交</a>
@@ -136,6 +140,10 @@
                   <a href="javascript:void(0);" style="color:red;">删除</a>
                 </a-popconfirm>
               </a-menu-item>
+
+              <!-- <a-menu-item>
+                <a href="javascript:void(0);" @click="itemNumberElement(record)">维护款号成分</a>
+              </a-menu-item> -->
             </a-menu>
 
             <!-- 已提交 且 推送成功   -->
@@ -203,6 +211,9 @@
       <detailsShipDet-drawer ref="detailsShipDetDrawer" @ok="modalFormOk"></detailsShipDet-drawer>
       <!-- 申报要素 弹框 -->
       <declareElements-modal ref="declareElementsModal"></declareElements-modal>
+
+      <!-- 维护款号成分 -->
+      <itemNumEle-modal ref="itemNumEleModal"></itemNumEle-modal>
     </div>
   </div>
 </template>
@@ -216,6 +227,7 @@ import addShipDetDrawer from '@views/shipment-details/addShipDetDrawer.vue'
 import detailsShipDetDrawer from '@views/shipment-details/detailsShipDetDrawer.vue'
 import editShipDetDrawer from '@views/shipment-details/editShipDetDrawer.vue'
 import declareElementsModal from '@views/shipment-details/declareElementsModal.vue'
+import itemNumEleModal from '@views/shipment-details/itemNumEleModal.vue'
 
 import {
   shipmentList,
@@ -240,7 +252,8 @@ export default {
     declareElementsModal,
     cancelSubmitShipment,
     pushShipment,
-    rePushShipment
+    rePushShipment,
+    itemNumEleModal
   },
 
   data() {
@@ -370,12 +383,12 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        {
-          title: '申报要素(单证维护)',
-          dataIndex: 'declarationElements',
-          width: 120,
-          className: 'replacecolor'
-        },
+        // {
+        //   title: '申报要素(单证维护)',
+        //   dataIndex: 'declarationElements',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
         {
           title: '套装件数（存货自定义项）',
           dataIndex: 'numberOfSets',
@@ -387,27 +400,27 @@ export default {
           dataIndex: 'isTc',
           width: 90,
           customRender: function(text) {
-            if (text == '0') {
+            if (text === '0') {
               return '否'
             }
-            if (text == '1') {
+            if (text === '1') {
               return '是'
             }
           },
           className: 'replacecolor'
         },
-        {
-          title: 'HScode',
-          dataIndex: 'hsCode',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '中文品名',
-          dataIndex: 'chineseName',
-          width: 120,
-          className: 'replacecolor'
-        },
+        // {
+        //   title: 'HScode',
+        //   dataIndex: 'hsCode',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
+        // {
+        //   title: '中文品名',
+        //   dataIndex: 'chineseName',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
 
         {
           title: '成衣工厂',
@@ -421,7 +434,12 @@ export default {
           width: 90,
           className: 'replacecolor'
         },
-
+        {
+          title: '账套',
+          dataIndex: 'account',
+          width: 90,
+          className: 'replacecolor'
+        },
         {
           title: '推送结果',
           dataIndex: 'pushState',
@@ -499,7 +517,11 @@ export default {
     //  申报要素
     declareElements(record) {
       this.$refs.declareElementsModal.declareElementsModVis = true
-      queryDeclarationElements({ hsCode: record.hsCode, id: record.id }).then(res => {
+      queryDeclarationElements({
+        inventoryName: record.inventoryName,
+        itemNumber: record.itemNumber,
+        account: record.account
+      }).then(res => {
         if (res.success) {
           console.log('申报要素主子表数据', res.result)
           // console.log('申报要素子表数据', res.result.syDeclarationElementsItemList)
@@ -509,6 +531,24 @@ export default {
         }
       })
     },
+    //  维护款号成分
+    itemNumberElement(record) {
+      this.$refs.itemNumEleModal.itemNumEleModVis = true
+      console.log('打开维护款号成分')
+      // queryDeclarationElements({
+      //   inventoryName: record.inventoryName,
+      //   itemNumber: record.itemNumber,
+      //   account: record.account
+      // }).then(res => {
+      //   if (res.success) {
+      //     console.log('维护款号成分数据', res.result)
+          // console.log('申报要素子表数据', res.result.syDeclarationElementsItemList)
+          // this.$refs.declareElementsModal.declareElements = res.result
+          // 子表赋值
+          // this.$refs.declareElementsModal.declareElementsData = res.result.syDeclarationElementsItemList
+        // }
+      // })
+    },
 
     //  详情
     details(record) {
@@ -637,6 +677,7 @@ export default {
       this.queryParam.salesman = ''
       this.queryParam.itemNumber = ''
       this.queryParam.refer = ''
+      this.queryParam.is = ''
       this.getShipmentList() // 渲染 发运明细列表
     },