Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

src/utils/custom.js

@@ -639,5 +639,3 @@ export function genJsSeqNo() {
   return seqNo
 }
 
-
-

src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue

@@ -193,10 +193,6 @@
       };
     },
     watch: {
-      value(newVal) {
-      },
-      svalue(newVal, oldVal) {
-      },
       countryCode(newVal, oldVal) {
         this.queryParams.countryCode = this.countryCode;
         this.initData();
@@ -207,6 +203,9 @@
       },
       isAddSite(val){
         this.initData();
+      },
+      selectSiteCode(val){
+       
       },
       // 根据名称筛选部门树
       filterName(val) {
@@ -241,15 +240,10 @@
       initData() {
         this.loading = true;
 
-        // console.log(this.queryParams)
-        // console.log(this.selectSiteCodeStr)
-
         if(this.selectSiteCodeStr!=null){
           this.checkList = this.selectSiteCodeStr.split(',');
         }
 
-        console.log(this.isAddSite);
-
         listSimpleEmisSite(this.queryParams).then(response => {
             this.loading = false;
             // 追加节点 过滤已经选中节点

src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue

@@ -70,7 +70,7 @@
         defaultValue:null
       },
       blIncludeChildSite:{
-        type: [String],
+        type: [String,Number],
         required: false,
         defaultValue:null
       },

src/views/emis/emisRegion/emisRegionForm.vue

@@ -1,7 +1,8 @@
 <template>
   <div >
-      <el-row :gutter="0">
+    
         <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
+          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
             <el-col :span="12">
               <el-form-item label="省份名称" v-if="form.regionType==1" prop="regionName">
                 <el-input v-model="form.regionName" placeholder="省份名称" />
@@ -70,8 +71,9 @@
                   <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
                 </el-form-item>
             </el-col>
-        </el-form>
           </el-row>
+        </el-form>
+      
       <div style="text-align: center;margin-bottom: 10px;">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>

src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue

@@ -275,12 +275,12 @@ export default {
       queryParams: {
         pageNum:1,
         pageSize:20,
-        scanType:null,
+        scanType:1,
-        scanSiteCode:null,
+        scanSiteCode:$store.getters.ownerSiteCode,
         preOrNextStationCode:null,
         scanManCode:null,
         params:{
-          thisSiteScanType:null,
+          thisSiteScanType:1,
           beginScanDate:null,
           endScanDate:null,
         },//扩展参数
@@ -310,7 +310,7 @@ export default {
     start.setHours(0,0,0,0)
     end.setHours(23,59,59,0)
     this.dateTimeRange=[start,end];
-    this.getList();
+    // this.getList();
   },
   methods: {
     // handleClick(){

src/views/emis/emisTmsTransPlan/planDtlPanel.vue

@@ -360,8 +360,6 @@ export default {
           }else{
             this.submitFormByNew();
           }
-
-          this.reset();
           this.open = false;
         }
       });

src/views/emis/emisWaybill/dispatchWaybillList.vue

@@ -839,6 +839,8 @@ export default {
     end.setHours(23,59,59,0)
     this.dateTimeRange=[start,end];
 
+    this.queryParams.dispatchUnderlingSiteCode=this.$store.getters.ownerSiteCode;
+
     this.getList();
     this.queryOrderType="1";
     this.queryOrderDateType="1";
@@ -852,11 +854,7 @@ export default {
     });
   },
   mounted() {
-    const end = new Date()
+   
-    const start = new Date()
-    start.setHours(0,0,0,0)
-    end.setHours(23,59,59,0)
-    this.dateTimeRange=[start,end];
   },
   methods: {
        //标红table指定行

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -2,15 +2,7 @@
   <XdPageContainer class="app-container">
 
     <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-      <!-- <el-row :gutter="10">
-        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6"><div class="grid-content bg-purple">123</div></el-col>
-        <el-col :xs="8" :sm="6" :md="8" :lg="8" :xl="6"><div class="grid-content bg-purple-light">123</div></el-col>
-        <el-col :xs="8" :sm="6" :md="8" :lg="8" :xl="6"><div class="grid-content bg-purple">123</div></el-col>
-        <el-col :xs="8" :sm="6" :md="8" :lg="8" :xl="6"><div class="grid-content bg-purple-light">123</div></el-col>
-      </el-row> -->
 
-
-      <!-- label-width="100px" -->
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
         <!-- :span="6" -->
         <el-col  :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@@ -843,25 +835,17 @@ export default {
     start.setHours(0,0,0,0)
     end.setHours(23,59,59,0)
     this.dateTimeRange=[start,end];
+    this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+
     
-    this.getList();
     this.queryOrderType="1";
     this.queryOrderDateType="1";
     // this.queryExpireNotSign="1"
 
-    // 调整表格的高度，不允许滚动
+    this.getList();
-    this.$nextTick(function() {
-      let queryFormEl = this.$refs.queryForm.$el;
-      let tableH = queryFormEl.offsetHeight+190;
-      this.tableHeight = window.innerHeight - tableH;
-    });
   },
   mounted() {
-    const end = new Date()
+  
-    const start = new Date()
-    start.setHours(0,0,0,0)
-    end.setHours(23,59,59,0)
-    this.dateTimeRange=[start,end];
   },
   methods: {
       //标红table指定行