md

src/views/emis/EmisBaseTools/EmisSupplierMultiplePicker.vue

@@ -51,36 +51,36 @@ props: {
 },
 data() {
   return {
+    loading: false,
+
     svalue: [],
     // 搜索后的数据
     optionItems:[],
     itemMap:new Map(),
-    loading: false,
-    queryParams:{
-      pageNum: 1,
-      pageSize: 50,
-      code:this.value,
-      name:null
-    }
+
+    searchSupplirCode:this.value,
+
+
   };
 },
 watch: {
   value(newVal) {
+    console.log("=watch==>",this.value);
     if(this.value) {
       this.svalue = this.value.split(',');
-      // this.queryData(null,this.value,this.value);
     }
-    // this.queryParams.sortCodeStr=this.value;
-    // console.log("xxxx===>xxx2:",this.queryParams)
-    // this.queryData(null);
   },
 
 },
 created() {
-  if(this.value) {
-    this.svalue = this.value.split(',');
-    this.queryData(null,this.value,this.value);
-  }
+  console.log("=mounted==>",this.value);
+},
+mounted(){
+  console.log("=mounted==>",this.value);
+    if(this.value) {
+      this.svalue = this.value.split(',');
+    }
+   this.queryData(null,this.value,this.value);
 },
 methods: {
   confirmOk(){
@@ -97,6 +97,7 @@ methods: {
     this.$refs.selectRef.blur();
   },
   onFocus(){
+      console.log("=onFocus==>",this.value);
     let selCodeStr=null;
     if(this.svalue&&this.svalue.length>0){
       selCodeStr=this.svalue.join(',');
@@ -104,6 +105,7 @@ methods: {
     this.queryData(null,null,selCodeStr);
   },
   onChange(val) {
+     console.log("=onChange==>",this.value);
     let selCodeStr="";
     if(this.svalue&&this.svalue.length>0){
       selCodeStr=this.svalue.join(',');
@@ -113,20 +115,24 @@ methods: {
     this.$emit('onChange',selCodeStr)
   },
   queryData(val,key,sortCodeStr) {
-    this.queryParams.pageNum=1;
-    this.queryParams.name=val;
-    this.queryParams.code=key;
-    this.queryParams.sortCodeStr=sortCodeStr;
 
-    console.log("xxxx===>xxx2:",this.queryParams)
-    listSimpleEmisSupplier(this.queryParams).then(response => {
+    let queryParams={
+      pageNum: 1,
+      pageSize: 50,
+      code:key,
+      name:val,
+      sortCodeStr:sortCodeStr
+    }
+
+    console.log("queryData--queryParams:",queryParams)
+
+    listSimpleEmisSupplier(queryParams).then(response => {
       this.optionItems=response.rows
-
-      this.optionItems.forEach(item => {
-        if(!(item.code in this.itemMap)){
-          this.itemMap[item.code]=item;
-        }
-      });
+      // this.optionItems.forEach(item => {
+      //   if(!(item.code in this.itemMap)){
+      //     this.itemMap[item.code]=item;
+      //   }
+      // });
 
     });
   },

src/views/emis/emisTmsSiteBatchMiss/index.vue

@@ -11,6 +11,10 @@
                   />
       </el-form-item>
 
+      <el-form-item label="发货时间" prop="">
+          <elDateAdvPicker   v-model="dateTimeRange"  ></elDateAdvPicker>
+      </el-form-item>
+
       <el-form-item label="线路" prop="lineCode">
           <TransLinePicker v-model="queryParams.lineCode"  isInitiated="true" ></TransLinePicker>
       </el-form-item>
@@ -118,6 +122,8 @@
       <el-table-column :label="$t('寄件国')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
 
+      <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
@@ -157,9 +163,9 @@
 
 <script>
 import { listEmisTmsSiteBatchMiss, getEmisTmsSiteBatchMiss, delEmisTmsSiteBatchMiss, addEmisTmsSiteBatchMiss, updateEmisTmsSiteBatchMiss } from "@/api/emis/emisTmsSiteBatchMiss";
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisTmsSiteBatchMissView from '@/views/emis/emisTmsSiteBatchMiss/emisTmsSiteBatchMissView';
 import emisTmsSiteBatchMissForm from '@/views/emis/emisTmsSiteBatchMiss/emisTmsSiteBatchMissForm';
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 
 
 import emisTransPlanRuleForm from '@/views/emis/emisTransPlanRule/emisTransPlanRuleForm';
@@ -178,7 +184,7 @@ import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 export default {
   name: "emisTmsSiteBatchMiss",
   components: {
-    elDateSimplePicker,
+    elDateAdvPicker,
     emisTransPlanRuleForm,
     EmisSupplierPicker,
     EmisSiteSimplePicker1,
@@ -245,8 +251,7 @@ export default {
     /** 查询TMS漏组批次信息表列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      listEmisTmsSiteBatchMiss(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listEmisTmsSiteBatchMiss(this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")).then(response => {
         this.emisTmsSiteBatchMissList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -328,7 +333,7 @@ export default {
           this.initQueryParams();
 
           let qExportParam={...this.queryParams};
-          qExportParam=this.addDateRange(qExportParam, this.dateTimeRange,'createTime')
+          qExportParam=this.addDateRange(qExportParam, this.dateTimeRange,'sendDate')
           qExportParam.pageNum=1;
           qExportParam.pageSize=20000;
 

src/views/emis/emisTransPlanRule/index.vue

@@ -148,7 +148,6 @@
       <emisTransPlanRuleForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTransPlanRuleForm>
     </el-dialog>
 
-
   </XdPageContainer>
 </template>