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

src/views/emis/customerService/traceRecordList.vue

@@ -3,7 +3,7 @@
     <xd-table v-loading="loading"
            border stripe
            size="mini"
-           height="300px"
+           height="400px"
            :data="scanRecordList"
            :queryParams="queryParams"
            :total="total"

src/views/emis/customerService/traceWaybillDetailView.vue

@@ -110,7 +110,6 @@ export default {
     };
   },
   created() {
-    console.log("=====>xxx==>",this.billDetail);
 
     if(this.billDetail.waybillStatus=='10'){
       this.active=1;

src/views/emis/customerService/waybillTracking.vue

@@ -33,9 +33,9 @@
 
     <div style="min-height: 100%;padding: 0px 10px 5px 0px;">
       <el-scrollbar style="height: 1000px">
-        <CardWithHeader v-for="(item,index) in emisWaybillList" :key="index" :header="'运单号:'+item.billCode" >
+        <CardWithHeader v-for="(item,index) in emisWaybillList" :key="resetRefreshId+'.'+index" :header="'运单号:'+item.billCode" >
             <template v-slot:body>
-              <TraceWaybillDetailView :billDetail="item"></TraceWaybillDetailView>
+              <TraceWaybillDetailView :billDetail="item" :key="resetRefreshId+'.d.'+index" ></TraceWaybillDetailView>
             </template>
         </CardWithHeader>
       </el-scrollbar>
@@ -60,7 +60,7 @@ export default {
   dicts: [],
   data() {
     return {
-
+      resetRefreshId:null,
       // 运单列表表格数据
       emisWaybillList: [],
 
@@ -76,8 +76,13 @@ export default {
 
   },
   methods: {
+    getUUID() {
+        return Math.random().toString(36).substring(3,10);
+    },
     /** 查询运单列表列表 */
     getList() {
+
+      this.resetRefreshId="tracing-"+this.getUUID();
       this.loading = true;
 
       if(!this.queryParams.billCode){

src/views/emis/emisTmsScanRecord/arrivalScan.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="0">
+      <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
-        <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
+        <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+
           <el-col :span="7">
             <el-form-item label="扫描单号" prop="billCode" label-width="70px">
               <span slot="label">
@@ -19,9 +20,9 @@
               </el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+      </el-form>
 
-        </el-form>
-      </el-row>
 
 
       <div slot="toolbar">
@@ -242,7 +243,7 @@ export default {
         this.$message.error("输入单号后回车");
         return;
       }
-      let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[]; 
+      let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
       let scanWeight = this.form.scanWeight
       let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
 

src/views/emis/emisWaybill/waybillDetailReadOnly.vue

@@ -73,8 +73,8 @@
 
             <el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
             <el-descriptions-item label="录单员">{{ form.registerManName }}</el-descriptions-item>
-            <el-descriptions-item label="收款人备注">{{ form.feeRemark }}</el-descriptions-item>
+            <el-descriptions-item label="费用备注">{{ form.feeRemark }}</el-descriptions-item>
-            <el-descriptions-item label="录单备注">{{ form.remark }}</el-descriptions-item>
+            <el-descriptions-item label="运单备注">{{ form.remark }}</el-descriptions-item>
 
 
 

src/views/emis/emisWaybillProblemInfo/problemEntry.vue

@@ -37,6 +37,7 @@
                 </span>
                 <el-input
                   v-model="form.remark"
+                  type="textarea"
                   :placeholder="$t('请输入')"
                   clearable
                 />

src/views/emis/emisWaybillTransfer/waybillTransfer.vue

@@ -27,12 +27,12 @@
         </el-col>
         <el-col :span="16">
           <el-col :span="8">
-            <el-form-item :label="$t('转件网点')" prop="registerSiteCode" label-width="80px">
+            <el-form-item :label="$t('转件网点')" prop="createSite" label-width="80px">
-              <EmisSiteSimplePicker v-model="queryParams.registerSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
+              <EmisSiteSimplePicker v-model="queryParams.createSite"  :disabled="$store.getters.ownerSiteCode != '88888'"  ></EmisSiteSimplePicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('转件公司')" prop="expressCode" label-width="80px">
+            <el-form-item :label="$t('转件公司')" prop="transferExpress" label-width="80px">
               <span slot="label">
                 <span>{{$t('转件公司')}}</span>
               </span>
@@ -40,17 +40,17 @@
                 style="width:100%"
                 filterable
                 clearable
-                v-model="queryParams.expressCode"
+                v-model="queryParams.transferExpress"
               >
-                <el-option v-for="item in dict.type.emis_express_code" :key="item.value" :label="item.label" :value="item.label" />
+                <el-option v-for="item in dict.type.emis_express_code" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('签收状态')" prop="isSignPic" label-width="80px">
+            <el-form-item :label="$t('签收状态')" prop="params.blSign" label-width="80px">
-              <el-select v-model="queryParams.isSign" :placeholder="$t('全部')" value="0">
+              <el-select v-model="queryParams.params.blSign" clearable="" :placeholder="$t('全部')" value="0">
-                <el-option :label="$t('未签收')" value="1"></el-option>
+                <el-option :label="$t('已签收')" value="1"></el-option>
-                <el-option :label="$t('已签收')" value="2"></el-option>
+                <el-option :label="$t('未签收')" value="0"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -91,7 +91,7 @@
               @click="handleAdd"
             >新增转件</el-button>
           </el-col>
-         
+
           <el-col :span="1.5">
             <el-button
               type="primary"
@@ -137,13 +137,13 @@
           <dict-tag :options="dict.type.emis_express_code" :value="scope.row.transferExpress"/>
         </template>
       </el-table-column> />
-      <el-table-column :label="$t('转件公司编码')" align="center" prop="transferExpress" min-width="100" />
+      <!-- <el-table-column :label="$t('转件公司编码')" align="center" prop="transferExpress" min-width="100" /> -->
       <el-table-column :label="$t('目的城市')" align="center" prop="transferCity" min-width="150" />
       <el-table-column :label="$t('物流公司联系人')" align="center" prop="linkMan" min-width="150" />
       <el-table-column :label="$t('电话')" align="center" prop="linkPhone" min-width="100" />
       <el-table-column :label="$t('签收状态')" align="center" prop="xxxx" min-width="100">
         <template slot-scope="scope">
-            <el-tag v-if="scope.row.waybillDetail.waybillStatus=='50'" type="success">已签收</el-tag>
+            <el-tag v-if="scope.row.waybillDetail.blSign=='1'" type="success">已签收</el-tag>
             <el-tag v-else type="danger">未签收</el-tag>
         </template>
       </el-table-column>
@@ -151,11 +151,17 @@
       <el-table-column :label="$t('转件体积')" align="center" prop="transferVolume" min-width="100" />
       <el-table-column :label="$t('转件网点')" align="center" prop="createSiteName" min-width="100" />
       <el-table-column :label="$t('操作人')" align="center" prop="createByName" min-width="150" />
+      <el-table-column :label="$t('登记时间')" align="center" prop="createTime" min-width="170">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('转件原因')" align="center" prop="transferResean" min-width="150">
         <template slot-scope="scope">
           <span class="ellipsis">{{ scope.row.transferResean }}</span>
         </template>
       </el-table-column>
+
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="150">
         <template slot-scope="scope">
           <span class="ellipsis">{{ scope.row.remark }}</span>
@@ -287,7 +293,7 @@ export default {
       total: 0,
       // 运单转件表表格数据
       emisTransferList: [],
-    
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -307,12 +313,12 @@ export default {
         pageNum: 1,
         pageSize: 20,
         billCode: null,
-        registerSiteCode:null,
+        createSite:null,
         orderSN:null,
-        expressCode:null,
+        transferExpress:null,
-        isSign:null,
         params:{
           queryOrderType:"1",
+          blSign:null,
         }
       },
       form:{
@@ -361,6 +367,10 @@ export default {
   },
   created() {
     this.$nextTick(function() {
+
+      if(this.$store.getters.ownerSiteCode != '88888'){
+        this.queryParams.createSite=this.$store.getters.ownerSiteCode;
+      }
       let queryFormEl = this.$refs.queryForm.$el;
       let tableH = queryFormEl.offsetHeight+190;
       this.tableHeight = window.innerHeight - tableH;
@@ -381,16 +391,16 @@ export default {
         return;
       }
       getWaybillDetail(this.form.billCode).then(response => {
-      
+
         if(response.code != 200){
           this.$modal.msgError(scanRstItem.msg);
           return;
-        } 
+        }
-      
+
         let record =Object.assign({}, response.data);
         this.form.transferWeight=record.billWeight;
         this.form.transferVolume=record.totalVolume;
-       
+
       });
 
     },
@@ -400,11 +410,12 @@ export default {
       this.emisTransferList = [];
       this.total = 0;
       // this.queryParams.params = {};
-      if (null != this.dateTimeRange && '' != this.dateTimeRange) {
+      // if (null != this.dateTimeRange && '' != this.dateTimeRange) {
-        this.queryParams.params["beginTransferDate"] = dateToStr(new Date(this.dateTimeRange[0]));
+      //   this.queryParams.params["beginTransferDate"] = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryParams.params["endTransferDate"] = dateToStr(new Date(this.dateTimeRange[1]));
+      //   this.queryParams.params["endTransferDate"] = dateToStr(new Date(this.dateTimeRange[1]));
-      }
+      // }
-      listEmisWaybillTransfer(this.queryParams).then(response => {
+
+      listEmisWaybillTransfer(this.addDateRange(this.queryParams, this.dateTimeRange,"transferDate")).then(response => {
         this.loading = false;
         if(!response.rows || response.rows.length == 0){
           // this.$message.error("未查到单号");
@@ -496,7 +507,7 @@ export default {
       this.state="add";
       this.titleForm = "新增";
     },
-    
+
     // handleShowMoreInput(){
     //   this.moreInputVisible = !this.moreInputVisible;
     // },