From b31e409dc15cc1b371fa105c1a00c9a1c48d649d Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Wed, 8 May 2024 16:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E4=BB=B6=E6=89=AB=E6=8F=8F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91=20&=20=E6=94=B6=E4=BB=B6=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/emis/emisSite.js                      |   9 +
 .../EmisBaseTools/EmisGetNextSitePicker.vue   | 190 +++++++++
 .../emis/emisTmsScanRecord/outgoingScan.vue   | 399 ++++++++++++++++++
 .../emis/emisTmsScanRecord/scanRecord.vue     |   2 +-
 4 files changed, 599 insertions(+), 1 deletion(-)
 create mode 100644 src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue
 create mode 100644 src/views/emis/emisTmsScanRecord/outgoingScan.vue

diff --git a/src/api/emis/emisSite.js b/src/api/emis/emisSite.js
index c2cf9f90..ec4206b7 100644
--- a/src/api/emis/emisSite.js
+++ b/src/api/emis/emisSite.js
@@ -26,6 +26,15 @@ export function getEmisSite(id) {
   })
 }
 
+//获取“下一站”列表
+export function getNextStationList(query) {
+  return request({
+    url: '/emis/emisTmsScanRecord/getNextStationList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 新增网点
 export function addEmisSite(data) {
   return request({
diff --git a/src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue b/src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue
new file mode 100644
index 00000000..0ef7ba20
--- /dev/null
+++ b/src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue
@@ -0,0 +1,190 @@
+<template>
+   <!-- :loading="loading" -->
+   <!-- v-el-select-loadmore="loadmore" -->
+        <!-- <i class="el-icon-arrow-down select-down" :class="visible&&'rotate180'"></i> -->
+
+   <el-select
+      filterable
+      clearable
+      autocomplete="false"
+      ref="selectDom"
+      v-model="svalue"
+      remote
+      :remote-method="queryData"
+      :placeholder="placeholder"
+      style="width: 100%;"
+      :disabled="disabled"
+      @focus="onFocus"
+      class="remote-select"
+      @change="onChange"
+      @clear="onClear"
+      @visible-change="reverseArrow"
+      >
+        <el-option v-for="item in dataList" :key="item.destSite" :label="item.destSite+'-'+item.destSiteName" :value="item.destSite" ></el-option>
+    </el-select>
+
+
+</template>
+<script>
+  import { getNextStationList } from "@/api/emis/emisSite";
+
+  export default {
+    name: "EmisSiteSimplePicker",
+    components: {
+
+    },
+    dicts: [],
+    props: {
+      value: {
+        type: String,
+        required: false
+      },
+      placeholder: {
+        type: String,
+        required: false
+      },
+      countryCode: {
+        type: String,
+        required: false
+      },
+      // siteType:{
+      //   type: [String,Number],
+      //   required: false
+      // },
+      isInitiated:{
+        type: [Boolean,String],
+        required: false,
+        default:false
+      },
+      disabled:{
+        type: [Boolean,String],
+        required: false
+      },
+    },
+    data() {
+      return {
+        loading:false,
+        visible:false,
+        dataList: [],
+        svalue: this.value,
+        filterMap:new Map(),
+        firstFlag:true,
+        queryParams:{
+          pageNum:1,
+          pageSize:20,
+          searchValue:null,
+          // siteType:this.siteType,
+          countryCode:this.countryCode,
+          destSite:null
+        }
+      };
+    },
+    watch: {
+      value(newVal) {
+        this.svalue = newVal;
+        console.log("000=>"+this.svalue);
+        this.firstFlag = true;
+        this.initData();
+      },
+      // siteType(newVal, oldVal) {
+      //   if(newVal!= oldVal ){
+      //   }
+      // },
+      // countryCode(newVal, oldVal) {
+      //   if(newVal!= oldVal ){
+      //   }
+      // }
+    },
+    created() {
+      // this.queryData();
+    },
+    beforeDestroy(){
+      this.firstFlag = true;
+    },
+    methods: {
+      onChange() {
+        this.$emit("input", this.svalue);
+        let itemData=this.filterMap[this.svalue];
+        this.$emit("onChange",itemData);
+      },
+      onClear(){
+        this.queryParams.searchValue=null;
+        this.queryData();
+      },
+      onFocus(){
+        this.queryData();
+      },
+      initData(){
+        if(this.svalue && this.firstFlag ){
+          let queryParams = {
+              destSite:this.svalue
+          }
+          getNextStationList(queryParams).then(response => {
+            this.dataList=response.rows;
+            const curItem = response.rows[0];
+            let curOption = {
+              currentLabel: curItem.destSiteName,
+              currentValue: curItem.destSite,
+              label:curItem.destSiteName,
+              value:curItem.destSite,
+            }
+            this.$refs.selectDom.cachedOptions.push(curOption)
+            response.rows.forEach(item => {
+              if(!this.filterMap.hasOwnProperty(item.destSite)){
+                this.filterMap[item.destSite]=item;
+              }
+            });
+            this.firstFlag = false;
+          });
+        }
+      },
+      queryData(val) {
+        if(val && this.queryParams.pageNum == 1){
+          this.dataList=[];
+        }
+        this.queryParams.searchValue=val;
+        getNextStationList(this.queryParams).then(response => {
+          this.dataList=response.rows;
+          response.rows.forEach(item => {
+            if(!this.filterMap.hasOwnProperty(item.destSite)){
+              this.filterMap[item.destSite]=item;
+            }
+          });
+        });
+      },
+      // loadmore() {
+      //   this.visible = true
+      //   this.queryParams.pageNum++;
+      //   this.queryData();
+      // },
+      reverseArrow(flag) {
+        let rulesDom = this.$refs["selectDom"].$el.querySelector(
+          ".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"
+        ); // 找到dom
+        if (flag) {
+          rulesDom.classList.add("is-reverse"); // 对dom新增class
+        } else {
+          rulesDom.classList.remove("is-reverse"); // 对dom新增class
+        }
+      },
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  // right: 30px;
+  // cursor: pointer;
+ :deep .el-select.remote-select{
+  .el-select__caret::before{
+      content: '\e6e1';
+    }
+  .is-focus{
+    .el-select__caret{
+      transform: rotateZ(0deg);
+    }
+  }
+}
+
+
+
+</style>
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
new file mode 100644
index 00000000..28b16da1
--- /dev/null
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -0,0 +1,399 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="0">
+        <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
+          <el-col :span="7">
+            <el-form-item label="扫描单号" prop="billCode" label-width="70px">
+              <span slot="label">
+                <span style="color: red">扫描单号</span>
+              </span>
+              <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput"  >
+                <i slot="suffix" class="iconfont">&#xe656;</i>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="重量" prop="scanWeight" label-width="60px">
+              <el-input v-model="form.scanWeight" placeholder="扫描重量" >
+                  <span slot="suffix">KG</span>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
+              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
+            </el-form-item>
+          </el-col>
+
+        </el-form>
+      </el-row>
+
+
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleScanUpload"
+                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                >上传</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="clearSelectionBatch"
+                  v-hasPermi="['emis:emisTmsScanRecord:remove']"
+                >删除</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleBatchScan"
+                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                >批量扫描</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
+      <el-table ref="multipleTable" border stripe v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column :label="$t('扫描单号')" align="center" prop="billCode" min-width="150" />
+        <el-table-column :label="$t('目的地网点')" align="center" prop="scanMan" min-width="150" />
+        <el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_scan_type" :value="scope.row.scanType"/>
+          </template>
+       </el-table-column>
+        <el-table-column :label="$t('扫描网点')" align="center" prop="scanSite" min-width="150" />
+        <el-table-column :label="$t('扫描员')" align="center" prop="scanMan" min-width="150" />
+        <el-table-column :label="$t('扫描时间')" align="center" prop="scanDate" min-width="170" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.scanDate) }}</span>
+          </template>
+       </el-table-column>
+        <el-table-column :label="$t('省份编号')" align="center" prop="dispatchOrSendMan" min-width="100" />
+        <el-table-column :label="$t('下一站')" align="center" prop="preOrNextStation" min-width="100" />
+        <el-table-column :label="$t('重量')" align="center" prop="scanWeight" min-width="100" />
+     </el-table>
+
+      <!-- <div style="text-align: center;margin-bottom: 10px;">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div> -->
+
+
+      <el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
+        <el-form ref="formBatch" :model="formBatch" :rules="rulesBatch" size="mini" label-width="60px">
+         <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('运单号')" prop="billCode">
+              <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
+         </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="text-align:center">
+          <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+          <el-button @click="cancelBatch">取 消</el-button>
+        </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { listEmisWaybill, getWaybillDetail,getEmisWaybill } from "@/api/emis/emisWaybill";
+import { doScan } from "@/api/emis/emisTmsScanRecord";
+// import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
+
+export default {
+  name: "OutgoingScan",
+  props:{
+    id:undefined
+  },
+  components: { EmisGetNextSitePicker },
+  dicts: ['emis_scan_type'],
+  data() {
+    return {
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      checkedDetail:[],
+      // 遮罩层
+      loading: false,
+      // 表单参数
+      form: {},
+      titleBatch: "",
+      formBatch: {},
+      openBatch:false,
+      dataMap:new Map(),
+      emisTmsScanRecordList: [],
+
+      // 是否显示弹出层
+      open: false,
+      // 表单校验
+      rules: {
+        // billCode: [
+        //   { required: true, message: "billCode不能为空", trigger: "blur" }
+        // ],
+        // id: [
+        //   { required: true, message: "id不能为空", trigger: "blur" }
+        // ],
+      },
+      rulesBatch: {
+        // id: [
+        //   { required: true, message: "id不能为空", trigger: "blur" }
+        // ],
+      }
+    };
+  },
+   watch: {
+      "id": {
+        handler (newValue, oldValue) {
+          this.id = newValue;
+          this.initData();
+        },
+        deep: true
+      }
+  },
+  created() {
+    this.reset();
+    this.form.scanSiteCode=this.$store.getters.ownerSiteCode;
+    this.form.scanSite=this.$store.getters.ownerSiteName;
+
+    this.form.scanMan=this.$store.getters.empName;
+    this.form.scanManCode=this.$store.getters.empCode;
+
+    this.form.recordMan=this.$store.getters.empName;
+    this.form.recordManCode=this.$store.getters.empCode;
+
+    this.form.dispatchOrSendManCode=this.$store.getters.empCode;
+
+    // this.form.scanWeight = "1.0";
+
+  },
+
+  methods: {
+    getRowSelect(row, column, event) {
+     // dosomething
+    },
+
+    onSiteSelect(item){
+        console.log(item)
+        // this.form.dispatchOrSendMan=item.empName;
+        // this.form.dispatchOrSendManCode=item.empCode;
+        this.form.preOrNextStation=item.destSiteName;
+        // this.form.preOrNextStation=item.destSiteName;
+
+        // Todo
+    },
+    getRowsSelect(arr) {
+      this.form.ids= arr.map(item=>item.id)
+    },
+    handleBatchScan(){
+      this.formBatch = {
+        billCode: null,
+      }
+      this.titleBatch="批量扫描";
+      this.openBatch=true;
+    },
+    clearSelectionBatch(){
+      let newList =[];
+      console.log(this.ids)
+      this.emisTmsScanRecordList.forEach(item=>{
+        if(this.ids.indexOf(item.billCode) == -1){
+          newList.push(item);
+        }else{
+          this.dataMap[item.billCode]=null;
+        }
+      });
+      this.emisTmsScanRecordList = newList;
+    },
+    cancelBatch(){
+      this.openBatch=false;
+    },
+    submitFormBatch(){
+
+
+      this.openBatch=false;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        billCode: null,
+        scanType: null,
+        preOrNextStation: null,
+        preOrNextStationCode: null,
+        preOrNextStationPhone: null,
+        preOrNextManCode: null,
+        preOrNextManPhone: null,
+        scanDate: null,
+        scanManCode: null,
+        scanManPhone: null,
+        scanMan: null,
+        preOrNextMan: null,
+        scanSite: null,
+        scanSiteCode: null,
+        scanSitePhone: null,
+        scanWeight: null,
+        weight: null,
+        dispatchOrSendMan: null,
+        dispatchOrSendManCode: null,
+        dispatchOrSendManPhone: null,
+        signDate: null,
+        signMan: null,
+        signSite: null,
+        signSiteCode: null,
+        recordMan: null,
+        recordManCode: null,
+        recordManPhone: null,
+        recordSiteCode: null,
+        truckMan: null,
+        truckCode: null,
+        dataFrom: null,
+        picUrl: null,
+        status: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        updateSite: null,
+        createSite: null
+      };
+      this.resetForm("form");
+    },
+  // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.billCode)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+
+      // this.checkedDetail = selection;
+
+
+      // if (selection.length > 1) {
+      //   this.$refs.multipleTable.clearSelection();
+      //   this.$refs.multipleTable.toggleRowSelection(selection.pop());
+      // } else {
+      //   //将选中行存入缓存中
+      //   this.checkedDetail = selection;
+      // }
+
+    },
+    // 扫描上传
+    handleScanUpload(){
+      var selData = this.$refs.multipleTable.selection;
+      console.log(selData);
+
+      let scanData=[];
+      selData.forEach(item=>{
+        scanData.push(
+          {
+            billCode:item.billCode,
+            scanWeight:item.scanWeight,
+            dispatchOrSendManCode:item.dispatchOrSendManCode
+          }
+        );
+      });
+
+       // 检查
+      let scanInfo = {scanType:"20",opType:2,scanData:scanData}
+      console.log(scanInfo)
+
+      doScan(scanInfo).then(response => {
+        console.log(response);
+        let scanRstItem = response.data.scanResult[0];
+        console.log(scanRstItem);
+        if(scanRstItem.result != 'success'){
+          this.$modal.msgError(scanRstItem.message);
+          return;
+        }
+
+        this.$modal.msgSuccess(scanRstItem.message);
+
+
+        // this.form.scanType = '10';
+        // this.form.scanDate  = new Date();
+        // let record =Object.assign({}, this.form);
+        // console.log(record)
+        // let indexBillCode=record.billCode;
+        // this.dataMap[indexBillCode]=record;
+        // this.emisTmsScanRecordList.push(record);
+
+        // this.form.billCode =null;
+      });
+
+
+    },
+    handleScanInput(){
+      if(this.form.billCode==null || this.form.billCode==''){
+        this.$message.error("输入单号后回车");
+        return;
+      }
+
+      if(this.dataMap[this.form.billCode]){
+        this.$message.error("重复扫描");
+        this.playNoticeTone(1);
+        return;
+      }
+
+      // 检查
+      let scanInfo = {
+        scanType:"20",
+        opType:1,
+        scanData:[
+          {
+            billCode:this.form.billCode,
+            scanWeight:this.form.scanWeight,
+            // dispatchOrSendManCode:this.form.dispatchOrSendManCode
+          }
+        ]
+      };
+
+      doScan(scanInfo).then(response => {
+        console.log(response);
+        let scanRstItem = response.data.scanResult[0];
+        console.log(scanRstItem);
+        if(scanRstItem.result != 'success'){
+          this.$modal.msgError(scanRstItem.message);
+          return;
+        }
+
+        this.form.scanType = '20';
+        this.form.scanDate  = new Date();
+        let record =Object.assign({}, this.form)
+        record.billCode=scanRstItem.billCode;
+        console.log(record)
+        let indexBillCode=record.billCode;
+        this.dataMap[indexBillCode]=record;
+        this.emisTmsScanRecordList.push(record);
+        console.log("test----->this.emisTmsScanRecordList", this.emisTmsScanRecordList);
+
+      });
+
+      this.form.billCode =null;
+
+    },
+
+  }
+};
+</script>
diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue
index 852b2948..a42343ab 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue
@@ -221,7 +221,7 @@ export default {
         if(this.ids.indexOf(item.billCode) == -1){
           newList.push(item);
         }else{
-          this.dataMap[indexBillCode]=null;
+          this.dataMap[item.billCode]=null;
         }
       });
       this.emisTmsScanRecordList = newList;