md

src/components/DatePickerAdv/elDateAdvPicker.vue

@@ -1,21 +1,21 @@
 <template>
-  <div class="datetimepicker">
+  <div class="date-box">
+    <!-- range-separator="-" -->
     <el-date-picker
-         size="small"
          v-show="true"
         v-model="datetimeRange"
         type="datetimerange"
-        range-separator="-"
+
         start-placeholder="开始日期"
         end-placeholder="结束日期"
-        align="left"
         ref="timeRangePicker"
         :picker-options="pickerOptions"
         @change="dateTimeChange"
+        width="100%"
       >
       </el-date-picker>
-      <i class="el-icon-date data_icon"></i>
   </div>
+
 </template>
 <script>
 export default {
@@ -26,13 +26,12 @@ export default {
   },
   props: {
       value: {
-        type: [String],
+        type: [String,Array],
         required: false
       },
   },
 	data() {
 		return {
-      value : [],
       selectType: '1', // 时间选择器当前选择
       datetimeRange: [],
       pickerOptions: {
@@ -182,13 +181,13 @@ export default {
 
 
 <style lang="scss" scoped>
-.datetimepicker {
+.date-box >>> .el-date-editor.el-input,.el-date-editor.el-input__inner {
-  position: relative;
+  width: 146px;
-
+  margin: 0 10px;
-  .el-date-editor .el-input__inner {
+}
-    border-left: none;
+.date-input >>> .el-input__inner {
-    border-radius: 0 4px 4px 0;
+  width: 146px;
-  }
+  height: 40px;
- }
+}
 
 </style>

src/utils/TnPrinterSdk.js

@@ -1,119 +0,0 @@
-import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth'
-let websock = null
-let messageCallback = null
-let errorCallback = null
-let wsUrl = ''
-let tryTime = 0
-// 与后端的协商，websocket请求需要带上token参数
-/*
-命令名称：
-command
-getPrinterList: 获取打印机列表
-getPrinterTplList: 获取打印模版列表
-sendToPrint：发送打印
-getPrinterVer：获取打印组件版本信息
-*/
-
-// 接收ws后端返回的数据
-function websocketonmessage (e) {
-  messageCallback(JSON.parse(e.data))
-}
-
-/**
- * 发起websocket连接
- * @param {Object} agentData 需要向后台传递的参数数据
- */
-function websocketSend (agentData) {
-  // 加延迟是为了尽量让ws连接状态变为OPEN
-  setTimeout(() => {
-    // 添加状态判断，当为OPEN时，发送消息
-    if (websock.readyState === websock.OPEN) { // websock.OPEN = 1
-      // 发给后端的数据需要字符串化
-      websock.send(JSON.stringify(agentData))
-    }
-    if (websock.readyState === websock.CLOSED) { // websock.CLOSED = 3
-      console.log('websock.readyState=3')
-      Message.error('ws连接异常，请稍候重试')
-      errorCallback()
-    }
-  }, 500)
-}
-
-// 关闭ws连接
-function websocketclose (e) {
-  // e.code === 1000  表示正常关闭。 无论为何目的而创建, 该链接都已成功完成任务。
-  // e.code !== 1000  表示非正常关闭。
-  if (e && e.code !== 1000) {
-    Message.error('ws连接异常，请稍候重试')
-    errorCallback()
-    // // 如果需要设置异常重连则可替换为下面的代码，自行进行测试
-    // if (tryTime < 10) {
-    //   setTimeout(function() {
-    //    websock = null
-    //    tryTime++
-    //    initWebSocket()
-    //    console.log(`第${tryTime}次重连`)
-    //  }, 3 * 1000)
-    //} else {
-    //  Message.error('重连失败！请稍后重试')
-    //}
-  }
-}
-// 建立ws连接
-function websocketOpen (e) {
-  // console.log('ws连接成功')
-}
-
-// 初始化weosocket
-function initWebSocket () {
-  if (typeof (WebSocket) === 'undefined') {
-    Message.error('您的浏览器不支持WebSocket，无法获取数据')
-    return false
-  }
-
-  const token = 'X-Token=' + getToken()
-  // ws请求完整地址
-  const requstWsUrl = wsUrl + '?' + token
-  websock = new WebSocket(requstWsUrl)
-
-  websock.onmessage = function (e) {
-    websocketonmessage(e)
-  }
-  websock.onopen = function () {
-    websocketOpen()
-  }
-  websock.onerror = function () {
-    Message.error('ws连接异常，请稍候重试')
-    errorCallback()
-  }
-  websock.onclose = function (e) {
-    websocketclose(e)
-  }
-}
-
-/**
- * 发起websocket请求函数
- * @param {string} url ws连接地址
- * @param {Object} agentData 传给后台的参数
- * @param {function} successCallback 接收到ws数据，对数据进行处理的回调函数
- * @param {function} errCallback ws连接错误的回调函数
- */
-export function sendWebsocket (url, agentData, successCallback, errCallback) {
-  wsUrl = url
-  initWebSocket()
-  messageCallback = successCallback
-  errorCallback = errCallback
-  websocketSend(agentData)
-}
-
-/**
- * 关闭websocket函数
- */
-export function closeWebsocket () {
-  if (websock) {
-    websock.close() // 关闭websocket
-    websock.onclose() // 关闭websocket
-  }
-}
-

src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue

@@ -20,7 +20,7 @@
       @clear="onClear"
       @visible-change="reverseArrow"
       >
-        <el-option v-for="item in dataList" :key="item.siteCode" :label="item.siteCode+'-'+item.siteName" :value="item.siteCode" ></el-option>
+        <el-option v-for="item in dataList" :key="item.siteCode" :label="item.siteName" :value="item.siteCode" ></el-option>
     </el-select>
 
 

src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue

@@ -2,7 +2,7 @@
   <div >
     <el-row :gutter="0">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="所属国家" prop="country">
                 <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
             </el-form-item>
@@ -11,9 +11,11 @@
             <el-form-item label="所属线路" prop="lineCode">
                 <TransLinePicker v-model="form.lineCode" :countryCode="form.country"></TransLinePicker>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="产品类型" prop="prodCode">
+              <TransProductCasPicker placeholder="产品类型" v-model="form.prodCodeSelArr"  @onChange="onProductChange" ></TransProductCasPicker>
+
               <TransProductPicker placeholder="产品类型" v-model="form.prodCode" :transLineCode="form.lineCode" @onChange="onProdChange"></TransProductPicker>
             </el-form-item>
           </el-col>
@@ -89,6 +91,7 @@ import { listEmisSpecialCalcWeight, getEmisSpecialCalcWeight, delEmisSpecialCalc
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
 
 export default {
   name: "emisSpecialCalcWeightForm",
@@ -97,7 +100,7 @@ export default {
       type:Number,
     }
   },
-  components: { CountryPicker,TransLinePicker,TransProductPicker },
+  components: { CountryPicker,TransLinePicker,TransProductCasPicker },
   dicts: [
         'sys_normal_disable',
         'emis_take_weight_method',
@@ -175,6 +178,7 @@ export default {
         id: null,
         country: null,
         lineCode: null,
+        prodCodeSelArr:null,
         prodCode: null,
         prodName: null,
         status: null,
@@ -193,6 +197,10 @@ export default {
       };
       this.resetForm("form");
     },
+    onProductChange(item){
+      this.form.lineCode=item[0];
+      this.form.prodCode=item[1];
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

src/views/emis/emisWaybill/emisWaybillRecord.vue

@@ -314,7 +314,7 @@
                             :data="form.cargoList"
                             size="mini"
                             style="width: 100%"
-                            max-height="100px"
+                            max-height="300px"
                             @cell-mouse-enter="handleGoodsCellEnter"
                             @cell-mouse-leave="handleGoodsCellLeave"
                           >
@@ -489,7 +489,7 @@
                             stripe
                             :data="form.feeItems"
                             size="mini"
-                            max-height="100px"
+                            max-height="300px"
                             style="width: 100%"
                           >
                           <!-- @cell-mouse-enter="handleCellEnter"
@@ -644,8 +644,8 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
 
 import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-
 import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+
 import ProvincePicker1 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
 import CityPicker1 from '@/views/emis/EmisBaseTools/CityPicker.vue';
 import DistrictPicker1 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';

src/views/system/post/index.vue

@@ -81,7 +81,7 @@
 
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="岗位编号" align="center" prop="postId" />
+      <!-- <el-table-column label="岗位编号" align="center" prop="postId" /> -->
       <el-table-column label="岗位编码" align="center" prop="postCode" />
       <el-table-column label="岗位名称" align="center" prop="postName" />
       <el-table-column label="岗位排序" align="center" prop="postSort" />