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

src/views/shipment-details/detailsShipDetDrawer.vue

@@ -1,14 +1,7 @@
 <template>
   <!-- 详情 发运明细 -->
   <div id="detailsShipDetDrawer">
-    <a-drawer
-      title="详情"
-      width="89%"
-      placement="right"
-      :closable="true"
-      :visible="visible"
-      @close="handleCancel">
-
+    <a-drawer title="详情" width="89%" placement="right" :closable="true" :visible="visible" @close="handleCancel">
       <!-- 主表信息 展示-->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
@@ -21,7 +14,7 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="单据日期" prop="billDate">
+                <a-form-model-item label="单据日期" prop="documentDate">
                   {{ detailsShipDet.documentDate }}
                 </a-form-model-item>
               </a-col>
@@ -33,7 +26,7 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="预发货日期" prop="scheduledShipDate">
+                <a-form-model-item label="预发货日期" prop="preDeliveryDate">
                   {{ detailsShipDet.preDeliveryDate }}
                 </a-form-model-item>
               </a-col>
@@ -44,8 +37,51 @@
                 </a-form-model-item>
               </a-col>
 
-              <a-col :md="18" :sm="18">
-                <a-form-model-item label="备注" prop="note">
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="订单类型" prop="orderType">
+                  {{ detailsShipDet.orderType }}
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="HScode" prop="hsCode">
+                  {{ detailsShipDet.hsCode }}
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="中文品名" prop="chineseName">
+                  {{ detailsShipDet.chineseName }}
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="英文品名" prop="englishProductName">
+                  {{ detailsShipDet.englishProductName }}
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="报关品名" prop="declarationName">
+                  {{ detailsShipDet.declarationName }}
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="成衣工厂" prop="garmentFactory">
+                  {{ detailsShipDet.garmentFactory }}
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="整单合计" prop="wholeOrderTotal">
+                  {{ detailsShipDet.wholeOrderTotal }}
+                </a-form-model-item>
+              </a-col>
+
+              <!-- U8系统适用 -->
+              <a-col :md="12" :sm="12">
+                <a-form-model-item label="备注" prop="memo">
                   {{ detailsShipDet.memo }}
                 </a-form-model-item>
               </a-col>
@@ -94,7 +130,7 @@ export default {
         {
           title: '账套',
           dataIndex: 'account',
-          width: 120,
+          width: 80,
           fixed: 'left',
           className: 'replacecolor'
         },
@@ -108,11 +144,12 @@ export default {
         {
           title: '款号',
           dataIndex: 'itemNumber',
-          // scopedSlots: { customRender: 'itemNumber' },
+          scopedSlots: { customRender: 'itemNumber' },
           fixed: 'left',
           width: 180,
           className: 'replacecolor'
         },
+
         // {
         //   title: '创建时间',
         //   dataIndex: 'createTime',
@@ -134,7 +171,12 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-
+        {
+          title: '订单主表ID',
+          dataIndex: 'syOrderDataId',
+          width: 80,
+          className: 'replacecolor'
+        },
         {
           title: '客户订单',
           dataIndex: 'customerOrder',
@@ -154,6 +196,29 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
+        {
+          title: '分销点',
+          dataIndex: 'distributionPoint',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '采购/委外订单号',
+          dataIndex: 'purOrSubOrder',
+          scopedSlots: { customRender: 'purOrSubOrder' },
+          // fixed: 'left',
+          width: 180,
+          className: 'replacecolor'
+        },
+        {
+          title: ' 报关单价',
+          dataIndex: 'customsDeclarationUnitPrice',
+          scopedSlots: { customRender: 'customsDeclarationUnitPrice' },
+          // fixed: 'left',
+          width: 180,
+          className: 'replacecolor'
+        },
+
         {
           title: '订单数量',
           dataIndex: 'orderQuantity',
@@ -170,28 +235,29 @@ export default {
         {
           title: '发货数量',
           dataIndex: 'shipmentQuantity',
-          // scopedSlots: { customRender: 'shipQuantity' },
+          scopedSlots: { customRender: 'shipmentQuantity' },
           width: 120,
           className: 'replacecolor'
         },
-         {
-          title: '是否TC',
-          dataIndex: 'isTc',
+
+        {
+          title: '套装件数',
+          dataIndex: 'numberOfSets',
+          scopedSlots: { customRender: 'numberOfSets' },
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '是否TC功能',
+          dataIndex: 'isTC',
           width: 90,
-          customRender: function(text) {
-            if (text == '0') {
-              return '否'
-            }
-            if (text == '1') {
-              return '是'
-            }
-          },
+          scopedSlots: { customRender: 'isTC' },
           className: 'replacecolor'
         },
         {
           title: '物料成分',
           dataIndex: 'materialComposition',
-          // scopedSlots: { customRender: 'materialComposition' },
+          scopedSlots: { customRender: 'materialComposition' },
           width: 140,
           className: 'replacecolor'
         },
@@ -221,12 +287,11 @@ export default {
           className: 'replacecolor'
         },
         // {
-        //   title: '整单合计',
-        //   dataIndex: 'wholeOrderTota',
+        //   title: '整单（合计）',
+        //   dataIndex: 'wholeOrderTotal',
         //   width: 120,
         //   className: 'replacecolor'
         // },
-
         {
           title: '销售部门',
           dataIndex: 'salesDepartment',
@@ -277,6 +342,19 @@ export default {
           className: 'replacecolor'
         },
 
+        {
+          title: '单价(销售)',
+          dataIndex: 'salesUnitPrice',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '工厂单价',
+          dataIndex: 'factoryUnitPrice',
+          width: 120,
+          scopedSlots: { customRender: 'factoryUnitPrice' },
+          className: 'replacecolor'
+        },
         {
           title: '付款条件',
           dataIndex: 'termOfPayment',
@@ -298,6 +376,14 @@ export default {
           className: 'replacecolor'
         },
 
+        {
+          title: '申报要素',
+          dataIndex: 'declarationElements',
+          width: 160,
+          scopedSlots: { customRender: 'declarationElements' },
+          className: 'replacecolor'
+        },
+
         {
           title: '价格备注',
           dataIndex: 'priceRemarks',
@@ -311,6 +397,41 @@ export default {
           width: 160,
           customRender: t => ellipsis(t),
           className: 'replacecolor'
+        },
+        {
+          title: '订单子表ID',
+          dataIndex: 'syOrderDataItemId',
+          width: 160,
+          className: 'replacecolor'
+        },
+
+        {
+          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'
         }
       ],
       detailsShipDet: [], // 主表信息

src/views/shipment-details/editShipDetDrawer.vue

@@ -235,18 +235,37 @@
                   <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 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>
 
               <!-- 操作 -->
               <span slot="operationSlot" slot-scope="text, record">
@@ -556,21 +575,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',
@@ -585,6 +590,42 @@ export default {
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
+        {
+          title: '订单子表ID',
+          dataIndex: 'syOrderDataItemId',
+          width: 160,
+          className: 'replacecolor'
+        },
+
+        {
+          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/shipmentList.vue

@@ -540,7 +540,9 @@ export default {
 
     // 操作 详情
     details(record) {
+      console.log('00')
       this.$refs.detailsShipDetDrawer.visible = true
+      console.log('11')
       // console.log('点击项的ID', record.id)
       shipmentQueryById({ id: record.id }).then(res => {
         if (res.success) {
@@ -548,7 +550,6 @@ export default {
           // 把通过id查询到的对象，赋值给子组件
           this.$refs.detailsShipDetDrawer.detailsShipDet = res.result
           this.$refs.detailsShipDetDrawer.syShippingDetailsItemList = res.result.syShippingDetailsItemList
-          // console.log('999', this.$refs.detailsShipDetDrawer.syShippingDetailsItemList)
         }
       })
     },