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

src/api/emis/emisWaybillAttachment.js

@@ -9,6 +9,14 @@ export function listEmisWaybillAttachment(query) {
   })
 }
 
+export function queryListByBillCode(query) {
+  return request({
+    url: '/emis/emisWaybillAttachment/queryListByBillCode',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询运单附件详细
 export function getEmisWaybillAttachment(id) {
   return request({

src/api/emis/emisWaybillProblemInfo.js

@@ -9,6 +9,14 @@ export function listEmisWaybillProblemInfo(query) {
   })
 }
 
+export function queryListByBillCode(query) {
+  return request({
+    url: '/emis/emisWaybillProblemInfo/queryListByBillCode',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询问题件详细
 export function getEmisWaybillProblemInfo(id) {
   return request({

src/views/emis/customerService/billPicList.vue

@@ -4,40 +4,12 @@
     <div v-for="(item,index) in dataList" :key="index">
       <ImagePreview height="80px" v-for="(pic,index2) in (item.fileUrl||'').split(',')" :key="index2" :src="pic" ></ImagePreview>
     </div>
-    <!-- <xd-table v-loading="loading"
-           border stripe
-           size="mini"
-           height="300px"
-           :data="dataList"
-           :queryParams="queryParams"
-           :total="total"
-           @queryTable="getList"
-           :showRightButton="false"
-           :showPagination="false"
-           :showOperateButton="false"
-           >
-      <el-table-column label="序号" align="center" min-width="60">
-        <template slot-scope="scope">
-          <span v-text="getIndex(scope.$index)"> </span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('录入时间')" align="center" prop="registerDate" min-width="170" >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.registerDate) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('图片')" align="center" prop="picUrl" min-width="100">
-        <template slot-scope="scope">
-          <ImagePreview height="50px" v-for="pic in (scope.row.picUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
-        </template>
-      </el-table-column>
 
-    </xd-table> -->
   </div>
 </template>
 
 <script>
-import { listEmisWaybillAttachment } from "@/api/emis/emisWaybillAttachment";
+import { queryListByBillCode } from "@/api/emis/emisWaybillAttachment";
 
 export default {
   name: "BillPicList",
@@ -77,7 +49,7 @@ export default {
             pageSize:1000,
             billCode:this.billCode
          }
-         listEmisWaybillAttachment(this.queryParams).then(response => {
+         queryListByBillCode(this.queryParams).then(response => {
           this.dataList = response.rows;
           this.total=response.total;
           this.loading = false;

src/views/emis/customerService/problemList.vue

@@ -110,7 +110,7 @@
 </template>
 
 <script>
-import { listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
+import { queryListByBillCode } from "@/api/emis/emisWaybillProblemInfo";
 
 export default {
   name: "TraceInfoView",
@@ -150,7 +150,7 @@ export default {
             pageSize:1000,
             billCode:this.billCode
          }
-         listEmisWaybillProblemInfo(this.queryParams).then(response => {
+         queryListByBillCode(this.queryParams).then(response => {
           this.dataList = response.rows;
           this.total=response.total;
           this.loading = false;

src/views/emis/customerService/traceRecordList.vue

@@ -11,6 +11,7 @@
            :showRightButton="false"
            :showPagination="false"
            :showOperateButton="false"
+           :default-sort="{prop: 'scanDate', order: 'descending'}"
            >
       <el-table-column label="序号" align="center" min-width="60">
         <template slot-scope="scope">
@@ -19,7 +20,7 @@
       </el-table-column>
 
 
-      <el-table-column :label="$t('扫描时间')" align="center" prop="scanDate" min-width="170" >
+      <el-table-column :label="$t('扫描时间')" align="center" prop="scanDate"  :sortable="true" :sort-method="sortByScanDate" min-width="170" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.scanDate) }}</span>
         </template>
@@ -88,6 +89,11 @@ export default {
     }
   },
   methods: {
+    sortByScanDate(obj1, obj2) {
+      let val1 = obj1.scanDate
+      let val2 = obj2.scanDate
+      return val1 - val2
+    },
     getList() {
          this.loading = true;
          this.queryParams={
@@ -121,6 +127,7 @@ export default {
 60 退回件
 70 留仓扫描
 80 转件扫描
+81 转件扫描
 -1 问题件
 100 入库扫描
 101 出库扫描
@@ -185,7 +192,7 @@ export default {
          }
          // 转件第三方物流信息,拼接三方公司物流轨迹
          else if(scanType=="81"){
-          content=''+scanRecord.remark+'';
+          content='<span class="transferGray" >'+scanRecord.remark+'</span>';
              // 查询转单轨迹
              // 拼接三方公司物流轨迹
          }
@@ -234,4 +241,8 @@ export default {
   color: #00BFFF;
   font-weight: bold;
 }
+
+.transferGray{
+  color: gray;
+}
 </style>