Merge remote-tracking branch 'origin/dev' into dev

src/layout/components/Navbar.vue

@@ -79,7 +79,7 @@ export default {
   data() {
     return {
       unreadMessage,
-      locale: getLocale(),
+      // locale: getLocale(),
       // 枚举
       // langDatas: LangEnum.LANG,
       notReadTotal:0,//要去取VUEX里面的未读数据总数，我不会,登录之后要调得到当前人未读记录总数接口放到VUEX中
@@ -87,8 +87,10 @@ export default {
     }
   },
   created() {
-   this.$store.dispatch('getNotMessage');
-   this.$store.dispatch('getToDoList');
+   setInterval(() => {
+    this.$store.dispatch('getNotMessage');
+    this.$store.dispatch('getToDoList');
+   }, 3000)
   },
   components: {
     Breadcrumb,
@@ -128,7 +130,6 @@ export default {
     matterNum(){
       return this.$store.state.user.matterNum
     }
-
   },
   watch:{
     lang(val){

src/store/modules/user.js

@@ -34,10 +34,10 @@ const user = {
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
     },
-    NOt_MESSAGE:(state, notMessage)=>{
+    SET_UNREAD:(state, notMessage)=>{
       state.notMessage = notMessage;
     },
-    GET_MAATER:(state, matterNum) => {
+    SET_TODO:(state, matterNum) => {
       state.matterNum = matterNum;
     }
   },
@@ -161,7 +161,7 @@ const user = {
     getNotMessage({commit}){
       return new Promise((resolve, reject) =>{
         getNotReadInternalMessageTotal().then((r)=>{
-          commit('NOt_MESSAGE',r.data);
+          commit('SET_UNREAD',r.data);
           resolve()
         }).catch(error =>{
           reject(error);
@@ -172,7 +172,7 @@ const user = {
     getToDoList({commit}){
       return new Promise((resolve,reject) =>{
         taskTodoCount().then(r => {
-          commit('GET_MAATER',r.data)
+          commit('SET_TODO',r.data)
           resolve()
         }).catch(err => {
           reject(err)

src/views/bpm/processInstance/detail.vue

@@ -568,14 +568,14 @@ export default {
         if (pass) {
           approveTask(data).then(response => {
             let p = this.matterNum
-            this.$store.commit('GET_MAATER', --p)
+            //this.$store.commit('GET_MAATER', --p)
             this.$modal.msgSuccess("审批通过成功！");
             this.getDetail(); // 获得最新详情
           });
         } else {
           rejectTask(data).then(response => {
             let p = this.matterNum
-            this.$store.commit('GET_MAATER', --p)
+            //this.$store.commit('GET_MAATER', --p)
             this.$modal.msgSuccess("审批不通过成功！");
             this.getDetail(); // 获得最新详情
           });
@@ -599,7 +599,7 @@ export default {
         updateTaskAssignee(this.updateAssignee.form).then(response => {
           this.$modal.msgSuccess("转派任务成功！");
           let p = this.matterNum
-          this.$store.commit('GET_MAATER', --p)
+          // this.$store.commit('GET_MAATER', --p)
           this.updateAssignee.open = false;
           this.getDetail(); // 获得最新详情
         });

src/views/bpm/processInstance/index.vue

@@ -82,13 +82,13 @@
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+      <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width" width="120px">
+        <div slot-scope="scope" style="white-space:nowrap">
           <el-button type="text" size="small" icon="el-icon-delete" v-if="scope.row.result === 1"
                      v-hasPermi="['bpm:process-instance:cancel']" @click="handleCancel(scope.row)">{{$t('取消')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)"
                      v-hasPermi="['bpm:process-instance:query']">{{$t('详情')}}</el-button>
-        </template>
+        </div>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->

src/views/ecw/box/indexSeaAir.vue

@@ -481,6 +481,9 @@ export default {
       this.$set(this.dialogCfg, "width", "600px");
       this.$set(this.dialogCfg, "fullscreen", false);
       this.$set(this.dialogCfg, "open", true);
+      this.currRow = {
+        transportType: "4",
+      };
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/ecw/offer/edit.vue

 <template>
   <div class="app-container">
 
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px" inline>
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" inline :validate-on-rule-change="false">
         <el-card>
             <div slot="header" class="card-title">{{$t('新建报价单')}}</div>
             <el-form-item :label="$t('所属人')" prop="relation">
@@ -552,31 +552,7 @@ export default {
         transportVO: {}
       },
       // 表单校验
-      rules: {
-        marks: [
-            {
-                validator: (rule, value, callback) => {
-                    if(value && !/[a-zA-Z]/.test(value.charAt(0))){
-                        return callback(new Error(this.$t('唛头必须以字母开头')))
-                    }
-                    callback()
-                },
-                trigger: 'blur'
-            }
-        ],
-        lineId:         [{ required: true, message: "请选择线路"}],
-        consignorId:    [{ required: true, message: "发货人不能为空",}],
-        consigneeId:    [{ required: true, message: "收货人不能为空"}],
-        startTime:      [{ required: true, message: "有效期开始时间不能为空"}],
-        endTime:        [{ required: true, message: "有效期结束时间不能为空"}],
-        transportId:    [{ required: true, message: "选择运输方式"}],
-        channelId:      [{ required: true, message: "选择出货渠道"}],
-        stopTime:       [{ required: true, message: "不能为空"}],
-        relation:       [{ required: true, message: "请选择所属人"}],
-        control:        [{ required: true, message: "请选择是否控货"}],
-        importance:     [{ required: true, message: "请选择重要成都"}]
-        /*sendstatus: [{ required: true, message: "站内信状态，0未发送，1已发送不能为空", trigger: "blur" }], */
-      },
+      
       labelStyle: 'width:120px',
       productNames: {}, // 品名id和名称对应关系
       couponAvailableGroupDtoList: [], // 可用优惠
@@ -587,6 +563,39 @@ export default {
     };
   },
   computed:{
+    rules(){
+        let rules = {
+            marks: [
+                {
+                    validator: (rule, value, callback) => {
+                        if(value && !/[a-zA-Z]/.test(value.charAt(0))){
+                            return callback(new Error(this.$t('唛头必须以字母开头')))
+                        }
+                        callback()
+                    },
+                    trigger: 'blur'
+                }
+            ],
+            lineId:         [{ required: true, message: "请选择线路"}],
+            /* consignorId:    [{ required: true, message: "发货人不能为空",}],
+            consigneeId:    [{ required: true, message: "收货人不能为空"}], */
+            startTime:      [{ required: true, message: "有效期开始时间不能为空"}],
+            endTime:        [{ required: true, message: "有效期结束时间不能为空"}],
+            transportId:    [{ required: true, message: "选择运输方式"}],
+            channelId:      [{ required: true, message: "选择出货渠道"}],
+            stopTime:       [{ required: true, message: "不能为空"}],
+            relation:       [{ required: true, message: "请选择所属人"}],
+            control:        [{ required: true, message: "请选择是否控货"}],
+            importance:     [{ required: true, message: "请选择重要成都"}]
+        }
+        if(this.form.relation == 1){
+            rules.consignorId = [{ required: true, message: "发货人不能为空",}]
+        }
+        if(this.form.relation == 2){
+            rules.consigneeId = [{ required: true, message: "收货人不能为空",}]
+        }
+        return rules
+    },
     exportCityList(){
         return this.tradeCityList.filter(item => item.type == 2)
     },

src/views/ecw/order/cargoControl.vue

@@ -99,7 +99,7 @@
       </el-table-column>
       <el-table-column :label="$t('控货状态')" align="center" prop="transportId">
         <template slot-scope="{row}">
-          <template v-if="row.cargoControlStatus == 1 && row.isToReview">放货中</template>
+          <template v-if="row.cargoControlStatus == 1 && row.isToReview">{{$t('放货中')}}</template>
           <dict-tag v-else :type="DICT_TYPE.CONTROL_GOODS_STATUS" :value="row.cargoControlStatus" />
         </template>
       </el-table-column>

src/views/ecw/order/detail.vue

@@ -94,7 +94,8 @@
           {{order.isExternalWarehouse ? $t('外部仓') : $t('自有仓') }}
           <template v-for="(item, index) in order.externalWarehouseDtoList" >
             <div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
-              {{$t('装柜时间')}}： {{item.estLoadingTime}} {{$t('装柜地址')}}：{{item.loadingAddress}}
+              <!-- {{$t('装柜时间')}}： {{item.estLoadingTime}} -->
+              {{$t('装柜地址')}}：{{item.loadingAddress}}
             </div>
           </template>
 

src/views/ecw/order/edit.vue

@@ -295,7 +295,7 @@
                 </el-form-item>
                 <div v-if="form.isExternalWarehouse" class="pl-50">
                     <div v-for="(item, index) in form.externalWarehouseDtoList" class="flex" :key="index">
-                        <div class="w-300">
+                        <!-- <div class="w-300">
                             <el-form-item :label="$t('装货时间')"
                             :prop="'externalWarehouseDtoList.' + index + '.estLoadingTime'"
                             :rules="{
@@ -304,8 +304,8 @@
                             >
                                 <el-date-picker v-model="item.estLoadingTime" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker>
                             </el-form-item>
-                        </div>
-                        <div class="w-300 ml-10">
+                        </div> -->
+                        <div class="w-300">
                             <el-form-item :label="$t('装货地址')"
                             :prop="'externalWarehouseDtoList.' + index + '.loadingAddress'"
                             :rules="{

src/views/ecw/order/exception/index.vue

@@ -105,7 +105,7 @@
       <el-table-column :label="$t('运输方式/目的地')" align="center">
           <template slot-scope="scope">
             <span><dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId"></dict-tag>
-            {{'/'+scope.row.destinationZh}}</span>
+            / {{$l(scope.row, 'destination')}}</span>
           </template>
       </el-table-column>
       <el-table-column :label="$t('控货')" align="center">

src/views/ecw/order/index.vue

@@ -146,7 +146,7 @@
       <el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName">
         <template slot-scope="{row}">
           {{row.startWarehouseName}}
-          <template v-if="row.isExternalWarehouse">({{$t('外部仓')}})</template>
+          <span style="color:red" v-if="row.isExternalWarehouse">({{$t('外部仓')}})</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式/目的地')" align="center" prop="transportId">

src/views/ecw/productPrice/edit.vue

@@ -316,6 +316,11 @@ export default {
         item.clearancePriceUnit = val
       })
     },
+    'form.allPriceUnit'(val){
+      this.specialProducts.forEach(item => {
+        item.allPriceUnit = val
+      })
+    },
     'form.allVolumeUnit'(val){
       this.specialProducts.forEach(item => {
         item.allVolumeUnit = val