【发运明细】新增table增加四个字段，申报要素接口参数增加id

src/field/document/shipmentDetail.md

@@ -19,11 +19,11 @@ memo '备注',
 declarationName '报关品名',
 hsCode 'HScode',
 englishProductName '英文品名',
-state 单据状态    （0 默认已保存，1 已提交）
-pushState 推送状态    （0 默认未推送   1 推送成功，2 推送失败）
+state 单据状态 （0 默认已保存，1 已提交）
+pushState 推送状态 （0 默认未推送 1 推送成功，2 推送失败）
 syShippingDetailsItemList 发运明细子表集合;
- distributionPoint 分销点，
- packId  pack_id
+distributionPoint 分销点，
+packId pack_id
 
 #### 发运明细子表字段
 
@@ -49,7 +49,7 @@ salesTypeText '销售类型文本',
 customerAbbreviation '客户简称',
 customerName '客户名称',
 exchangeRate '汇率',
-wholeOrderTotal '整单合计',
+wholeOrderTotal '整单（合计）',
 salesDepartment '销售部门',
 salesman '业务员',
 currencyValue '币种',
@@ -88,19 +88,19 @@ chineseName '中文品名',
 englishName '英文品名',
 garmentFactory '成衣工厂',
 
-
 #### 申报要素 弹框
 
 ## 主表
-hsCode   HSCODE
 
-englishProductName  英文品名
+hsCode HSCODE
+
+englishProductName 英文品名
 
 declarationName 报关品名
 
-## 子表 
+## 子表
 
-typeValue  类型
+typeValue 类型
 
 describeText 描述
 
@@ -111,3 +111,11 @@ describeText 描述
 币种 currencyText
 
 订单数据 orderDate
+
+## 加 到新增 table 表头
+
+处理方式 treatmentMethod
+是否手册纱 manualYarnFlag
+手册纱单价 manualYarnUnitPrice
+手册纱占比 manualYarnProportion
+

src/views/reportForms/dye-loss-table/testedit.vue

@@ -1,142 +0,0 @@
-<template>
-  <!-- 染损报表 未筛选供应商 ref="chart" -->
-  <div id="myChart" :style="{ width: '100%', height: '600px' }"></div>
-</template>
-
-<script>
-import * as echarts from 'echarts' //必须有
-export default {
-  name: 'AllLossChart', // 未筛选供应商，所有供应商染损分析图
-  data() {
-    return {
-      // cvenName: [], //供应商
-      // dyeLossRate: [] //染损
-    }
-  },
-  props: {
-    // fatherList: {
-    //   type: Object,
-    //   default: () => ({})
-    // }
-  },
-  mounted() {
-    this.drawChart()
-  },
-
-  methods: {
-    drawChart() {
-      // const myChart = echarts.init(this.$ref.chart)
-      const myChart = echarts.init(document.getElementById('myChart')) // 初始化
-      // 指定图标的配置项和数据
-      this.option = {
-        // 工具提示
-        title: {
-          text: '所有供应商物料染损统计图'
-        },
-        tooltip: {},
-        legend: {
-          data: ['染损']
-        },
-        xAxis: {
-          type: 'category',
-          // data: this.fatherList.cvenName
-          data: ['FASHIONTEX', 'HARMONY', 'MAO XING YUAN', 'RongSen', 'SLJ', 'TIMBERMET', '国运森']
-        },
-        yAxis: {
-          type: 'value',
-          name: '(%)'
-        },
-        series: [
-          {
-            name: '损耗',
-            type: 'line',
-            smooth: true,
-            data: [5, 20, 36, 10, 10, 20]
-            // data: this.fatherList.dyeLossRate
-          }
-        ]
-      }
-      // 深色, 'dark'
-
-      // const myChart = echarts.init(this.$ref.chart) // 初始化
-      myChart.setOption(option) // 渲染页面
-
-      //随着屏幕大小调节图表
-      // window.addEventListener('resize', () => {
-      //   myChart.resize()
-      // })
-    }
-  }
-  // 监视数据变化
-  // watch: {
-  //   fatherList: {
-  //     handler(newData) {
-  //       const myChart = echarts.init(this.$ref.chart)
-  // this.option = {
-  //   // 工具提示
-  //   title: {
-  //     text: '所有供应商物料染损统计图'
-  //   },
-  //   tooltip: {},
-  //   legend: {
-  //     data: ['染损']
-  //   },
-  //   xAxis: {
-  //     type: 'category',
-  //     data: newData.cvenName
-  //     // data: this.fatherList.cvenName
-  //     // data: ['FASHIONTEX', 'HARMONY', 'MAO XING YUAN', 'RongSen', 'SLJ', 'TIMBERMET', '国运森']
-  //   },
-  //   yAxis: {
-  //     type: 'value',
-  //     name: '(%)'
-  //   },
-  //   series: [
-  //     {
-  //       name: '损耗',
-  //       type: 'line',
-  //       smooth: true,
-  //       data: newData.dyeLossRate
-  //       // data: [5, 20, 36, 10, 10, 20]
-  //       // data: this.fatherList.dyeLossRate
-  //     }
-  //   ]
-  // }
-  //   },
-  //   immediate: true, // 立即监视
-  //   deep: true
-  // }
-  // }
-}
-</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;
-// }
-
-/deep/ .ant-table-footer .ant-table.body {
-  // overflow: hidden !important;
-}
-/deep/ .ant-table.ant-table-bordered .ant-table-footer {
-  border: none;
-  padding: 0;
-}
-#myChart {
-  h6 {
-    font-size: 16px;
-    font-weight: 700;
-  }
-}
-</style>

src/views/shipment-details/addShipDetDrawer.vue

@@ -61,60 +61,18 @@
                 </a-form-model-item>
               </a-col>
 
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="pack id" prop="packId">
-                  <a-input placeholder="请输入pack id" v-model="addShipDet.packId"></a-input>
-                </a-form-model-item>
-              </a-col> -->
-
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="分销点" prop="distributionPoint">
-                  <a-input placeholder="请输入分销点" v-model="addShipDet.distributionPoint"></a-input>
-                </a-form-model-item>
-              </a-col> -->
-
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="数量" prop="todo">
-                  <a-input placeholder="合计" v-model="addShipDet.todo"></a-input>
-                </a-form-model-item>
-              </a-col> -->
-
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="单价" prop="salesUnitPrice">
-                  <a-input placeholder="销售" v-model="addShipDet.salesUnitPrice"></a-input>
-                </a-form-model-item>
-              </a-col> -->
-
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="采购/委外订单号" prop="purOrSubOrder">
-                  <a-input placeholder="请输入采购/委外订单号" v-model="addShipDet.purOrSubOrder"></a-input>
-                </a-form-model-item>
-              </a-col> -->
-
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="订单类型" prop="orderType">
                   <a-input placeholder="请输入订单类型" v-model="addShipDet.orderType"></a-input>
                 </a-form-model-item>
               </a-col>
 
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="工厂单价" prop="factoryUnitPrice">
-                  <a-input placeholder="采购/委外单价" v-model="addShipDet.factoryUnitPrice"></a-input>
-                </a-form-model-item>
-              </a-col> -->
-
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="HScode" prop="hsCode">
                   <a-input placeholder="HScode" v-model="addShipDet.hsCode"></a-input>
                 </a-form-model-item>
               </a-col>
 
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="套装件数" prop="numberOfSets">
-                  <a-input placeholder="存货自定义项" v-model="addShipDet.numberOfSets"></a-input>
-                </a-form-model-item>
-              </a-col> -->
-
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="中文品名" prop="chineseName">
                   <a-input placeholder="请输入中文品名" v-model="addShipDet.chineseName"></a-input>
@@ -144,11 +102,6 @@
                   <a-input placeholder="整单合计" v-model="addShipDet.wholeOrderTotal"></a-input>
                 </a-form-model-item>
               </a-col>
-              <!-- <a-col :md="6" :sm="8">
-                <a-form-model-item label="报关单价" prop="customsDeclarationUnitPrice">
-                  <a-input placeholder="请输入报关单价" v-model="addShipDet.customsDeclarationUnitPrice"></a-input>
-                </a-form-model-item>
-              </a-col> -->
 
               <!-- U8系统适用 -->
               <a-col :md="12" :sm="12">
@@ -248,18 +201,38 @@
                   <a-input style="width:100%" type="text" v-model="record.declarationElements" />
                 </a-form-model-item>
               </template>
-              <!-- 中文品名 :rules="rules.chineseName"-->
-              <!-- <template slot="chineseName" slot-scope="text, record, index">
-                <a-form-model-item prop="chineseName">
-                  <a-input style="width:100%" type="text" v-model="record.chineseName" />
+
+              <!--处理方式 -->
+              <template slot="treatmentMethod" slot-scope="text, record, index">
+                <a-form-model-item prop="treatmentMethod">
+                  <a-input style="width:100%" type="text" v-model="record.treatmentMethod" />
                 </a-form-model-item>
-              </template> -->
-              <!-- 英文品名 :rules="rules.englishName"-->
-              <!-- <template slot="englishName" slot-scope="text, record, index">
-                <a-form-model-item prop="englishName">
-                  <a-input style="width:100%" type="text" v-model="record.englishName" />
+              </template>
+
+              <!--是否手册纱 -->
+              <template slot="manualYarnFlag" slot-scope="text, record, index">
+                <a-form-model-item prop="manualYarnFlag">
+                  <a-select v-model="record.manualYarnFlag">
+                    <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>
+              </template>
+
+              <!--手册纱单价 -->
+              <template slot="manualYarnUnitPrice" slot-scope="text, record, index">
+                <a-form-model-item prop="manualYarnUnitPrice">
+                  <a-input style="width:100%" type="text" v-model="record.manualYarnUnitPrice" />
                 </a-form-model-item>
-              </template> -->
+              </template>
+
+              <!--手册纱占比 -->
+              <template slot="manualYarnProportion" slot-scope="text, record, index">
+                <a-form-model-item prop="manualYarnProportion">
+                  <a-input style="width:100%" type="text" v-model="record.manualYarnProportion" />
+                </a-form-model-item>
+              </template>
 
               <!-- 操作 -->
               <template slot="operationSlot" slot-scope="text, record, index">
@@ -579,21 +552,7 @@ export default {
           scopedSlots: { customRender: 'declarationElements' },
           className: 'replacecolor'
         },
-        //  {
-        //   title: '中文品名',
-        //   dataIndex: 'chineseName',
-        //   width: 160,
-        //   scopedSlots: { customRender: 'chineseName' },
-        //   className: 'replacecolor'
-        // },
 
-        // {
-        //   title: '英文品名',
-        //   dataIndex: 'englishName',
-        //   width: 160,
-        //   scopedSlots: { customRender: 'englishName' },
-        //   className: 'replacecolor'
-        // },
         {
           title: '价格备注',
           dataIndex: 'priceRemarks',
@@ -611,15 +570,39 @@ export default {
         {
           title: '订单子表ID',
           dataIndex: 'syOrderDataItemId',
-          width: 80,
+          width: 160,
           className: 'replacecolor'
         },
+
         {
-          title: '订单主表ID',
-          dataIndex: 'syOrderDataId',
-          width: 80,
+          title: '处理方式',
+          dataIndex: 'treatmentMethod',
+          width: 160,
+          scopedSlots: { customRender: 'treatmentMethod' },
           className: 'replacecolor'
         },
+        {
+          title: '是否手册纱',
+          dataIndex: 'manualYarnFlag',
+          width: 100,
+          scopedSlots: { customRender: 'manualYarnFlag' },
+          className: 'replacecolor'
+        },
+        {
+          title: '手册纱单价',
+          dataIndex: 'manualYarnUnitPrice',
+          width: 160,
+          scopedSlots: { customRender: 'manualYarnUnitPrice' },
+          className: 'replacecolor'
+        },
+        {
+          title: '手册纱占比',
+          dataIndex: 'manualYarnProportion',
+          width: 120,
+          scopedSlots: { customRender: 'manualYarnProportion' },
+          className: 'replacecolor'
+        },
+
         {
           title: '操作',
           dataIndex: 'operation',

src/views/shipment-details/declareElementsModal.vue

@@ -1,5 +1,4 @@
 <template>
-<!-- 申报要素 -->
   <div id="declareElementsModal">
     <!-- @ok="onSubmit"      keyboard="{false}"
       destroyOnClose="{true}"
@@ -17,8 +16,7 @@
         <div class="table-page-search-wrapper">
           <a-form-model layout="inline" ref="form" :model="declareElements">
             <a-row :gutter="24">
-
-             <a-col :md="6" :sm="8" style="display: none;">
+              <a-col :md="6" :sm="8" style="display: none;">
                 <a-form-model-item label="ID" prop="id">
                   {{ declareElements.id }}
                 </a-form-model-item>
@@ -142,7 +140,6 @@ export default {
       loading: false, // 表格加载
       // 子表表头
       declareElementsColumns: [
-      
         {
           title: '序号',
           width: 30,
@@ -163,7 +160,7 @@ export default {
           dataIndex: 'describeText',
           width: 80,
           scopedSlots: { customRender: 'describeText' },
-        
+
           className: 'replacecolor'
         },
 
@@ -209,20 +206,19 @@ export default {
       newObj.syDeclarationElementsItemList = this.declareElementsData
       // newDeclareElement.documentNo = this.addShipDet.documentNo // 单据号
       syDeclarationElementsAdd(newObj).then(res => {
-          if (res.success) {
-            this.$message.success('新增成功')
-            console.log('新增的对象', newObj)
-            this.close()
-        
-          }
-        })
+        if (res.success) {
+          this.$message.success('新增成功')
+          console.log('新增的对象', newObj)
+          this.close()
+        }
+      })
       this.close()
       // 刷新
     },
     handletypeValue(e) {
       console.log('类型下拉菜单click', e)
     },
-     // 操作 删除
+    // 操作 删除
     handleDelete(index) {
       console.log('index', index)
       console.log('删除报关要素数据', index)

src/views/shipment-details/shipmentList.vue

@@ -332,8 +332,14 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '数量（合计）',
-          dataIndex: 'shipmentQuantity',
+          title: '整单（合计）',
+          dataIndex: 'wholeOrderTotal',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '英文品名',
+          dataIndex: 'englishProductName',
           width: 120,
           className: 'replacecolor'
         },
@@ -527,7 +533,7 @@ export default {
     declareElements(record) {
       // console.log('点击申报要素hsCode', record.hsCode)
       this.$refs.declareElementsModal.declareElementsModVis = true
-      queryDeclarationElements({ hsCode: record.hsCode }).then(res => {
+      queryDeclarationElements({ hsCode: record.hsCode, id: record.id }).then(res => {
         if (res.success) {
           console.log('申报要素主子表数据', res.result)
           // console.log('申报要素子表数据', res.result.syDeclarationElementsItemList)