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

src/views/shipment-details/detailsShipDetDrawer.vue

@@ -93,7 +93,7 @@ export default {
       columns: [
         {
           title: '账套',
-          dataIndex: 'acSetNo',
+          dataIndex: 'account',
           width: 120,
           fixed: 'left',
           className: 'replacecolor'
@@ -130,7 +130,7 @@ export default {
         },
         {
           title: '业务类型',
-          dataIndex: 'businessTypeValue',
+          dataIndex: 'businessTypeText',
           width: 120,
           className: 'replacecolor'
         },
@@ -155,30 +155,37 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '订单数据',
-          dataIndex: 'orderData',
+          title: '订单数量',
+          dataIndex: 'orderQuantity',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '订单剩余数量',
-          dataIndex: 'orderRemaQuantity',
+          dataIndex: 'orderRemainingQuantity',
           width: 120,
           className: 'replacecolor'
         },
 
         {
           title: '发货数量',
-          dataIndex: 'shipQuantity',
+          dataIndex: 'shipmentQuantity',
           // scopedSlots: { customRender: 'shipQuantity' },
           width: 120,
           className: 'replacecolor'
         },
-        {
-          title: '是否TC功能',
-          dataIndex: 'isTC',
+         {
+          title: '是否TC',
+          dataIndex: 'isTc',
           width: 90,
-          // scopedSlots: { customRender: 'isTC' },
+          customRender: function(text) {
+            if (text == '0') {
+              return '否'
+            }
+            if (text == '1') {
+              return '是'
+            }
+          },
           className: 'replacecolor'
         },
         {
@@ -191,7 +198,7 @@ export default {
 
         {
           title: '销售类型',
-          dataIndex: 'salesTypeValue',
+          dataIndex: 'salesTypeText',
           width: 120,
           className: 'replacecolor'
         },
@@ -213,12 +220,12 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        {
-          title: '整单合计',
-          dataIndex: 'wholeOrderTota',
-          width: 120,
-          className: 'replacecolor'
-        },
+        // {
+        //   title: '整单合计',
+        //   dataIndex: 'wholeOrderTota',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
 
         {
           title: '销售部门',
@@ -234,7 +241,7 @@ export default {
         },
         {
           title: '币种',
-          dataIndex: 'currencyValue',
+          dataIndex: 'currencyText',
           width: 120,
           className: 'replacecolor'
         },

src/views/shipment-details/editShipDetDrawer.vue

@@ -14,8 +14,8 @@
           <a-form-model layout="inline" ref="form" :model="editShipDet" >
             <!-- 主表信息 填写-->
             <a-row :gutter="24">
-              <a-col :md="6" :sm="8">
-                <!-- required 必填项 *-->
+               <a-col :md="6" :sm="8">
+                <!-- required必填项 disabled 禁用  -->
                 <a-form-model-item label="单据号" prop="documentNo">
                   <a-input placeholder="请输入单据号" v-model="editShipDet.documentNo"></a-input>
                 </a-form-model-item>
@@ -33,8 +33,8 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="客户简称" prop="customer">
-                  <a-input placeholder="请输入客户简称" v-model="editShipDet.customer"></a-input>
+                <a-form-model-item label="客户" prop="customer">
+                  <a-input placeholder="请输入客户" v-model="editShipDet.customer"></a-input>
                 </a-form-model-item>
               </a-col>
 
@@ -52,7 +52,7 @@
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="预完工日期" prop="preCompletionDate">
                   <a-date-picker
-                    placeholder="请选择到货日期"
+                    placeholder="请选择预完工日期"
                     :format="dateFormat"
                     style="width:100%;"
                     v-model="editShipDet.preCompletionDate"
@@ -60,6 +60,90 @@
                 </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="editShipDet.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="editShipDet.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="editShipDet.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="editShipDet.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="editShipDet.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="editShipDet.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="editShipDet.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="editShipDet.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="editShipDet.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="editShipDet.chineseName"></a-input>
+                </a-form-model-item>
+              </a-col>
+          
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="英文品名" prop="englishProductName">
+                  <a-input placeholder="请输入英文品名" v-model="editShipDet.englishProductName"></a-input>
+                </a-form-model-item>
+              </a-col> 
+
+                 <a-col :md="6" :sm="8">
+                <a-form-model-item label="报关品名" prop="declarationName">
+                  <a-input placeholder="请输入报关品名" v-model="editShipDet.declarationName"></a-input>
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="成衣工厂" prop="garmentFactory">
+                  <a-input placeholder="请输入成衣工厂" v-model="editShipDet.garmentFactory"></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="editShipDet.customsDeclarationUnitPrice"></a-input>
+                </a-form-model-item>
+              </a-col> -->
+
               <a-col :md="18" :sm="18">
                 <a-form-model-item label="备注" prop="memo">
                   <a-input placeholder="请输入备注" v-model="editShipDet.memo"></a-input>
@@ -91,36 +175,84 @@
               :scroll="{ x: 1500 }"
               @change="handleTableChange"
             >
-              <!-- 款号 输入框  :rules="rules.itemNumber" required-->
+              <!-- 款号 输入框 :rules="rules.itemNumber" -->
               <template slot="itemNumber" slot-scope="text, record, index">
                 <a-form-model-item prop="itemNumber">
                   <a-input style="width:100%" type="text" v-model="record.itemNumber" />
                 </a-form-model-item>
               </template>
 
-              <!-- 发货数量 :rules="rules.shipmentQuantity" -->
-              <template slot="shipQuantity" slot-scope="text, record, index">
+              <!-- 发货数量 :rules="rules.shipQuantity"-->
+              <template slot="shipmentQuantity" slot-scope="text, record, index">
                 <a-form-model-item prop="shipmentQuantity">
-                  <a-input style="width:100%" type="text" v-model="record.shipQuantity" />
+                  <a-input style="width:100%" type="text" v-model="record.shipmentQuantity" />
                 </a-form-model-item>
               </template>
 
-              <!-- 是否TC功能 :rules="rules.isTC" -->
+              <!-- 是否TC功能 :rules="rules.isTC"-->
+              <!-- isTc ' 是否 tc 功能 0 否 1 是', -->
               <template slot="isTC" slot-scope="text, record, index">
-                <a-form-model-item prop="isEnable" >
-                  <a-select v-model="record.isTC">
-                    <a-select-option :value="0">否</a-select-option>
+                <a-form-model-item prop="isTc">
+                  <a-select v-model="record.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>
               </template>
 
               <!-- 物料成分 :rules="rules.materialComposition"-->
               <template slot="materialComposition" slot-scope="text, record, index">
-                <a-form-model-item prop="materialComposition" >
+                <a-form-model-item prop="materialComposition">
                   <a-input style="width:100%" type="text" v-model="record.materialComposition" />
                 </a-form-model-item>
               </template>
+              
+              <!-- 采购/委外订单号 :rules="rules.purOrSubOrder"-->
+              <template slot="purOrSubOrder" slot-scope="text, record, index">
+                <a-form-model-item prop="purOrSubOrder">
+                  <a-input style="width:100%" type="text" v-model="record.purOrSubOrder" />
+                </a-form-model-item>
+              </template>
+              
+               <!-- 报关单价 :rules="rules.customsDeclarationUnitPrice"-->
+              <template slot="customsDeclarationUnitPrice" slot-scope="text, record, index">
+                <a-form-model-item prop="customsDeclarationUnitPrice">
+                  <a-input style="width:100%" type="text" v-model="record.customsDeclarationUnitPrice" />
+                </a-form-model-item>
+              </template>
+               <!-- 套装件数 :rules="rules.numberOfSets"-->
+               <template slot="numberOfSets" slot-scope="text, record, index">
+                <a-form-model-item prop="numberOfSets">
+                  <a-input style="width:100%" type="text" v-model="record.numberOfSets" />
+                </a-form-model-item>
+              </template>
+              
+              <!-- 工厂单价 :rules="rules.factoryUnitPrice"-->
+               <template slot="factoryUnitPrice" slot-scope="text, record, index">
+                <a-form-model-item prop="factoryUnitPrice">
+                  <a-input style="width:100%" type="text" v-model="record.factoryUnitPrice" />
+                </a-form-model-item>
+              </template>
+              
+                <!-- 申报要素 :rules="rules.declarationElements"-->
+               <template slot="declarationElements" slot-scope="text, record, index">
+                <a-form-model-item prop="declarationElements">
+                  <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" />
+                </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" />
+                </a-form-model-item>
+              </template> -->
 
               <!-- 操作 -->
               <span slot="operationSlot" slot-scope="text, record">
@@ -178,11 +310,11 @@ export default {
     return {
       id: '',
       // 表头
-      columns: [
+       columns: [
         {
           title: '账套',
-          dataIndex: 'pkOrg',
-          width: 120,
+          dataIndex: 'account',
+          width: 80,
           fixed: 'left',
           className: 'replacecolor'
         },
@@ -218,7 +350,7 @@ export default {
         },
         {
           title: '业务类型',
-          dataIndex: 'businessTypeValue',
+          dataIndex: 'businessTypeText',
           width: 120,
           className: 'replacecolor'
         },
@@ -243,8 +375,31 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '订单数据',
-          dataIndex: 'orderData',
+          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',
           width: 120,
           className: 'replacecolor'
         },
@@ -258,7 +413,15 @@ export default {
         {
           title: '发货数量',
           dataIndex: 'shipmentQuantity',
-          scopedSlots: { customRender: 'shipQuantity' },
+          scopedSlots: { customRender: 'shipmentQuantity' },
+          width: 120,
+          className: 'replacecolor'
+        },
+        
+         {
+          title: '套装件数',
+          dataIndex: 'numberOfSets',
+          scopedSlots: { customRender: 'numberOfSets' },
           width: 120,
           className: 'replacecolor'
         },
@@ -279,7 +442,7 @@ export default {
 
         {
           title: '销售类型',
-          dataIndex: 'salesTypeValue',
+          dataIndex: 'salesTypeText',
           width: 120,
           className: 'replacecolor'
         },
@@ -301,12 +464,12 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        {
-          title: '整单合计',
-          dataIndex: 'wholeOrderTotal',
-          width: 120,
-          className: 'replacecolor'
-        },
+        // {
+        //   title: '数量（合计）',
+        //   dataIndex: 'wholeOrderTotal',
+        //   width: 120,
+        //   className: 'replacecolor'
+        // },
 
         {
           title: '销售部门',
@@ -322,7 +485,7 @@ export default {
         },
         {
           title: '币种',
-          dataIndex: 'currencyValue',
+          dataIndex: 'currencyText',
           width: 120,
           className: 'replacecolor'
         },
@@ -358,6 +521,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',
@@ -379,6 +555,28 @@ export default {
           className: 'replacecolor'
         },
 
+        {
+          title: '申报要素',
+          dataIndex: 'declarationElements',
+          width: 160,
+          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',
@@ -484,8 +682,10 @@ export default {
     },
     // --------------------------------------
     // 操作 删除
-    handleDelete(id) {
-      console.log('id:', id)
+    handleDelete(index) {
+      console.log('index', index)
+      console.log('删除该项订单数据', index)
+      return this.syShippingDetailsItemList.splice(index, 1)
     },
     // 操作 复制
     copy(record) {},