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

src/views/packing-list/clothes-list.vue

@@ -109,8 +109,7 @@
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="推送状态">
-                  <a-select v-model="queryParam.pushState">
-                    <a-select-option value="">请选择</a-select-option>
+                  <a-select v-model="pushState" mode="multiple"  @change = "handleChange">
                     <a-select-option value="0">未推送</a-select-option>
                     <a-select-option value="1">推送成功</a-select-option>
                     <a-select-option value="2">推送失败</a-select-option>
@@ -576,6 +575,7 @@ export default {
       ],
 
       clothesListData: [],
+      pushState:[],
       selectedNumber:0,//已选择条数
       selectedRowKeys: [], // 勾选航
       loading: false, // 表格加载
@@ -660,8 +660,13 @@ export default {
         pageSize:dd.pageSize
       }
       this.preDeliveryDate = []
+      this.pushState = []
       this.getSpltList()
     },
+    handleChange(data){
+      this.pushState = data
+      this.queryParam.pushState =data.length!==0? data.join():''
+    },
     // 推送
     push() {},
      // 导入

src/views/packing-list/fabric-list.vue

@@ -62,7 +62,7 @@
               </a-col>
                <a-col :md="6" :sm="8">
                 <a-form-model-item label="是否被参照">
-                  <a-select v-model="queryParam.isReference">
+                  <a-select v-model="queryParam.isReference"  >
                     <a-select-option value="">请选择</a-select-option>
                     <a-select-option value="1">是</a-select-option>
                     <a-select-option value="0">否</a-select-option>
@@ -80,8 +80,8 @@
             </a-col>
             <a-col :md="6" :sm="8">
                 <a-form-model-item label="推送状态">
-                  <a-select v-model="queryParam.pushState">
-                    <a-select-option value="">请选择</a-select-option>
+                  <a-select v-model:value="pushState" mode="multiple"  @change = "handleChange">
+                  <!-- <a-select v-model="queryParam.pushState"   @search="handleChange"> -->
                     <a-select-option value="0">未推送</a-select-option>
                     <a-select-option value="1">推送成功</a-select-option>
                     <a-select-option value="2">推送失败</a-select-option>
@@ -253,6 +253,7 @@ export default {
   data() {
     // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {
+      pushState:[],
       // 表头
       fabricListColumns: [
         
@@ -388,7 +389,8 @@ export default {
       queryParam: {
         pageNo: '', // 初始页
         isReference:'0',
-        pageSize:'50'
+        pageSize:'50',
+        pushState:''
       },
       pagination:{
         pageSizeOptions: ["50", "100", "150"],
@@ -490,6 +492,8 @@ export default {
         isReference:'0',
         pageSize:this.pagination.pageSize
       }
+      this.pushState=[]
+      debugger
       this.getFabricList()
     },
     // ------------------------------------
@@ -804,6 +808,10 @@ export default {
         })
         this.selectedRowKeys = []
     },
+    handleChange(data){
+      this.pushState = data
+      this.queryParam.pushState =data.length!==0? data.join():''
+    },
     // --------------------------------------
     // ??
     modalFormOk() {},
@@ -833,6 +841,7 @@ export default {
     enclosureUrl: function() {
       return `${window._CONFIG['domianURL']}/${this.url.enclosureUrl}`
     },
+    
     // 选中项
     rowSelection() {
       return {

src/views/shipment-details/declareElementsModal.vue

@@ -124,13 +124,14 @@
               <!-- 类型 下拉选择 -->
               <template slot="typeValueSlot" slot-scope="text, record, index">
                 <a-form-model-item prop="typeValue">
-                   <a-select v-model="record.typeValue">
-                  <a-select-option
-                     v-for="(item,index) in arrOption"
-                     :key="index"
-                     :value="item.value">
-                     {{item.label}}
-                  </a-select-option>
+                   <a-select v-model="record.typeValue" @change="changeType(record,index)">
+                      <a-select-option
+                        v-for="(item,index) in arrOption"
+                        :key="index"
+                        :value="item.value"
+                        >
+                          {{item.label}}
+                      </a-select-option>
                    </a-select>
 
                   <!-- <j-dict-select-tag v-model="record.typeValue" placeholder="请选择类型" style="text-align:left;"
@@ -142,7 +143,7 @@
               <!-- 描述 输入框-->
               <template slot="describeText" slot-scope="text, record, index">
                 <a-form-model-item prop="describeText">
-                  <a-input style="width:100%" type="text" v-model="record.describeText" :disabled="pushState"/>
+                  <a-input style="width:100%" type="text" v-model="record.describeText" :disabled="pushState||record.mandatoryAssign"/>
                 </a-form-model-item>
               </template>
 
@@ -288,11 +289,20 @@ export default {
         index: '',
         typeValue: '',
         describeText: '',
-        operation: ''
+        operation: '',
+        mandatoryAssign:false
       }
       this.declareElementsData.push(addrow)
     },
-
+    changeType(record,index){
+          if(record.typeValue=='品名'){
+          record.describeText = this.declareElements.declarationName
+          record.mandatoryAssign = true
+        }else{
+          this.$set(record,'mandatoryAssign',false)
+          this.$forceUpdate()
+        }
+    },
     //查询最近报关信息
     queryLatelyDeclarationElements(){
       var hscode = this.declareElements.declarationName;
@@ -302,6 +312,12 @@ export default {
         res.result['itemIds'] = this.declareElements.itemIds;
         this.declareElements=res.result;
         this.declareElementsData=res.result.syDeclarationElementsItemList;
+        this.declareElementsData.map(item=>{
+          if(item.typeValue=='品名'){
+            item.mandatoryAssign = true
+            item.describeText = this.declareElements.declarationName
+          }else{item.mandatoryAssign = false}
+        })
         this.declareElements.inventoryName = inventoryName
         //console.info("赋值数据："+JSON.stringify(this.declareElements))
       }else{
@@ -347,6 +363,9 @@ export default {
           item.sort = index+1
         })
         newObj.syDeclarationElementsItemList = this.declareElementsData
+        newObj.syDeclarationElementsItemList.map(event=>{
+          delete event.mandatoryAssign
+        })
         // newDeclareElement.documentNo = this.addShipDet.documentNo // 单据号
         syDeclarationElementsAdd(newObj).then(res => {
         if (res.success) {

src/views/shipment-details/shipmentList.vue

@@ -801,8 +801,8 @@ export default {
           if (res.success) {
             // console.log('申报要素子表数据', res.result.syDeclarationElementsItemList)
             res.result['itemIds'] = record.itemIds;
-
             this.$refs.declareElementsModal.declareElements = res.result
+            this.$refs.declareElementsModal.getOption()
             this.$refs.declareElementsModal.declareElements.declarationName  = record.declarationName
             this.$refs.declareElementsModal.declareElements.englishProductName  = record.englishProductName
             this.$refs.declareElementsModal.declareElements.hsCode  = record.hsCode
@@ -819,6 +819,14 @@ export default {
           if(this.copyTableData.length==0||!(this.copyFromData.orderNumber == record.orderNumber && this.copyFromData.itemNumber==record.itemNumber && this.copyFromData.account == record.account&& this.copyFromData.inventoryName == record.inventoryName)){
            // 子表赋值
             this.$refs.declareElementsModal.declareElementsData = res.result.syDeclarationElementsItemList
+            this.$refs.declareElementsModal.declareElementsData.map(item=>{
+              if(item.typeValue=='品名'){
+                item.mandatoryAssign = true
+                item.describeText = this.$refs.declareElementsModal.declareElements.declarationName
+              }else{
+                item.mandatoryAssign = false
+              }
+        })
           }else{
             this.$refs.declareElementsModal.declareElementsData = this.copyTableData
           }
@@ -901,7 +909,6 @@ export default {
       if(yesA == 'yes'){
         this.loading = true
         exportXls(obj).then(res =>{
-          debugger
         if(res.message){
           this.loading = false
           this.$message.error(res.message)