bug修改

src/views/order/orderDetailDrawer.vue

@@ -30,8 +30,8 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="销售类型" prop="salesTypeValue">
-                {{ orderDetail.salesTypeValue }}
+              <a-form-model-item label="销售类型" prop="salesTypeText">
+                {{ orderDetail.salesTypeText }}
               </a-form-model-item>
             </a-col>
 
@@ -65,8 +65,8 @@
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="币种" prop="currencyValue">
-                {{ orderDetail.currencyValue }}
+              <a-form-model-item label="币种" prop="currencyText">
+                {{ orderDetail.currencyText }}
               </a-form-model-item>
             </a-col>
 

src/views/shipment-details/addShipDetDrawer.vue

@@ -114,7 +114,7 @@
               <!-- 款号 输入框 :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-input style="width:100%" type="text" v-model="record.itemNumber" readOnly />
                 </a-form-model-item>
               </template>
 
@@ -293,7 +293,6 @@ export default {
         {
           title: '款号',
           dataIndex: 'itemNumber',
-          scopedSlots: { customRender: 'itemNumber' },
           fixed: 'left',
           width: 180,
           className: 'replacecolor'
@@ -400,7 +399,6 @@ export default {
           dataIndex: 'shipmentQuantity',
           scopedSlots: { customRender: 'shipmentQuantity' },
           width: 120,
-          className: 'replacecolor'
         },
 
         {
@@ -741,7 +739,8 @@ export default {
     },
     // 操作 复制 复制一行已有的数据
     copy(record) {
-      this.syShippingDetailsItemList.push(record)
+      var newRecord = JSON.parse(JSON.stringify(record));
+      this.syShippingDetailsItemList.push(newRecord)
     },
 
     handleCancel() {

src/views/shipment-details/declareElementsModal.vue

@@ -5,7 +5,7 @@
       v-model="declareElementsModVis"
       :confirmLoading="confirmLoading"
       @cancel="handleCancel"
-      width="60%"
+      width="80%"
       style="top:330px;left:100px;"
     >
       <!-- 主表信息 回显  -->
@@ -93,18 +93,9 @@
               <!-- 类型 下拉选择 -->
               <template slot="typeValueSlot" slot-scope="text, record, index">
                 <a-form-model-item prop="typeValue">
-                  <a-select v-model="record.typeValue" style="width:100%">
-                    <a-select-option value="">请选择</a-select-option>
-                    <a-select-option :value="0">品名</a-select-option>
-                    <a-select-option :value="1">织造方法(针织或钩编)</a-select-option>
-                    <a-select-option :value="2">种类(西服、便服套装、上衣、长裤、马裤、工装裤等)</a-select-option>
-                    <a-select-option :value="3">类别(女式)</a-select-option>
-                    <a-select-option :value="4">成分含量</a-select-option>
-                    <a-select-option :value="5">品牌</a-select-option>
-                    <a-select-option :value="6">货号</a-select-option>
-                    <a-select-option :value="7">品牌类型</a-select-option>
-                    <a-select-option :value="8">出口享惠情况</a-select-option>
-                  </a-select>
+                  <j-dict-select-tag v-model="record.typeValue" placeholder="请选择类型" style="text-align:left;"
+                    dictCode="sys_dict_item,item_text,item_text,dict_id='1536626597689970689'" >
+                  </j-dict-select-tag>
                 </a-form-model-item>
               </template>
 
@@ -179,15 +170,14 @@ export default {
         {
           title: '类型',
           dataIndex: 'typeValue',
-          width: 80,
+          width: 250,
           scopedSlots: { customRender: 'typeValueSlot' },
           // customRender: t => ellipsis(t),
-          className: 'replacecolor'
         },
         {
           title: '描述',
           dataIndex: 'describeText',
-          width: 80,
+          width: 200,
           scopedSlots: { customRender: 'describeText' },
 
           className: 'replacecolor'

src/views/shipment-details/detailsShipDetDrawer.vue

@@ -227,10 +227,16 @@ export default {
         },
         {
           title: '是否TC功能',
-          dataIndex: 'isTC',
+          dataIndex: 'isTc',
           width: 90,
-          scopedSlots: { customRender: 'isTC' },
-          className: 'replacecolor'
+          className: 'replacecolor',
+          customRender:function(value){
+            if (value == "1")
+              return "是";
+            else if (value == "0")
+              return "否";
+            return value;
+          }
         },
         {
           title: '物料成分',

src/views/shipment-details/editShipDetDrawer.vue

@@ -10,7 +10,7 @@
               <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-input placeholder="请输入单据号" v-model="editShipDet.documentNo" readOnly></a-input>
                 </a-form-model-item>
               </a-col>
 
@@ -146,8 +146,8 @@
                 <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-option value="1">是</a-select-option>
+                    <a-select-option value="0">否</a-select-option>
                   </a-select>
                 </a-form-model-item>
               </template>
@@ -204,8 +204,8 @@
                 <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-option value="1">是</a-select-option>
+                    <a-select-option value="0">否</a-select-option>
                   </a-select>
                 </a-form-model-item>
               </template>
@@ -301,7 +301,6 @@ export default {
         {
           title: '款号',
           dataIndex: 'itemNumber',
-          scopedSlots: { customRender: 'itemNumber' },
           fixed: 'left',
           width: 180,
           className: 'replacecolor'
@@ -400,7 +399,7 @@ export default {
         },
         {
           title: '是否TC功能',
-          dataIndex: 'isTC',
+          dataIndex: 'isTc',
           width: 90,
           scopedSlots: { customRender: 'isTC' },
           className: 'replacecolor'

src/views/shipment-details/referOrderDataModal.vue

@@ -5,7 +5,7 @@
     :confirmLoading="confirmLoading"
     @ok="onSubmit"
     @cancel="handleCancel"
-    width="76%"
+    width="90%"
   >
     <!-- tabel 加载 -->
     <a-spin :spinning="confirmLoading">
@@ -26,13 +26,37 @@
                   v-model="queryParam.account"
                   dict="view_account,account,account">
                 </j-search-select-tag>
-                <!-- <a-select placeholder="请选择账套" v-model="queryParam.account">
-                  <a-select-option value="">请选择</a-select-option>
-                  <a-select-option :value="0">香港森语(101)</a-select-option>
-                </a-select> -->
               </a-form-item>
             </a-col>
-
+            <a-col :md="6" :sm="8">
+                <a-form-item label="业务员">
+                  <a-input placeholder="请输入业务员" v-model="queryParam.salesman"></a-input>
+                </a-form-item>
+              </a-col>
+            <template v-if="toggleSearchStatus">
+              <a-col :md="6" :sm="8">
+                <a-form-item label="客户">
+                  <j-search-select-tag
+                    placeholder="请选择客户"
+                    v-model="queryParam.customerName"
+                    dict="view_customer,customerfullname,customerfullname">
+                  </j-search-select-tag>
+                </a-form-item>
+                
+              </a-col>
+              <a-col :md="6" :sm="8">
+                <a-form-item label="订单日期">
+                  <a-range-picker
+                    style="width: 100%"
+                    :mode="dataRangeMode"
+                    :placeholder="['开始日期', '结束日期']"
+                    :value="dateRange"
+                    format = "YYYY-MM-DD"
+                    @change="dateRangeSelectChange"
+                  />
+                </a-form-item>
+              </a-col>
+            </template>
             <a-col :md="6" :sm="8">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -59,7 +83,7 @@
         :pagination="pagination"
         :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         @change="handleTableChange"
-        :scroll="{ x: 1500, y:500 }"
+        :scroll="{ x: 1500, y:450 }"
       >
       </a-table>
     </a-spin>
@@ -387,6 +411,8 @@ export default {
       pagination: {},
       confimList: [], //勾选的订单数组
       propList: [], //需要给新增页的数据
+      dateRange:[],
+      dataRangeMode:['date','date'],
     }
   },
   // 接收父组件 方法
@@ -473,6 +499,17 @@ export default {
     handleCancel() {
       this.close();
     },
+    // 时间发生变化的回调，发生在用户选择时间时
+    dateRangeSelectChange(value) {
+      this.dateRange = value;
+      if (value.length == 0){
+        this.queryParam.startDeliveryDate = "";
+        this.queryParam.endDeliveryDate = "";
+      }else{
+        this.queryParam.startDeliveryDate = value[0].format('YYYY-MM-DD');
+        this.queryParam.endDeliveryDate  = value[1].format('YYYY-MM-DD');
+      }
+    },
   },
   computed: {
     // 选中项