Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/system/operatelog.js

@@ -5,8 +5,8 @@ export function listOperateLog(query) {
   return request({
     url: '/system/operate-log/page',
     method: 'get',
-    params: query,
     timeout: 5*6000,
+    params: query
   })
 }
 
@@ -17,7 +17,6 @@ export function exportOperateLog(query) {
     method: 'get',
     params: query,
     timeout: 5*6000,
-
     responseType: 'blob'
   })
 }

src/components/UserSelector/index.vue

@@ -17,11 +17,15 @@
 </template>
 <script>
 import {getCustomerContactsSelect, getCustomerContacts} from '@/api/ecw/customerContacts'
-import {listSimpleUsers} from '@/api/system/user'
+import {listServiceUser, listSimpleUsers} from '@/api/system/user'
 export default {
     props:{
         value: [String, Number],
-        clearable: Boolean
+        clearable: Boolean,
+        manage:{
+          type:Boolean,
+          default:false
+        }
     },
     data(){
         return {
@@ -44,9 +48,18 @@ export default {
         }
     },
     created(){
+      if(this.manage){
+        // 客户经理
+        listServiceUser().then(r=>{
+          this.list = r.data;
+        })
+      }else {
+        // 全部客户
         listSimpleUsers().then(res => {
           this.list = res.data
         })
+      }
+
         // this.init()
     },
     methods:{

src/utils/request.js

@@ -106,6 +106,9 @@ service.interceptors.response.use(res => {
     } else if (code === 555) {
       // 额外情况
       return Promise.reject(res.data)
+    } else if (code === 566) {
+      // 额外情况
+      return Promise.reject(res.data)
     } else if (code !== 200) {
       Notification.error({
         title: msg

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -77,7 +77,8 @@
               </el-row>
               <el-row>
                 <span>{{$t('品牌')}}：
-                  <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
+                  <template v-if="scope.row.brandName">{{scope.row.brandName}}</template>
+                  <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
                 </span>
                 <span style="margin-left: 10px;">{{$t('箱数')}}：{{scope.row.warehouseInInfoVO ? scope.row.warehouseInInfoVO.cartonsNum : 0 }}</span>
                 <span style="margin-left: 10px;">{{$t('体积')}}：{{scope.row.warehouseInInfoVO ? scope.row.warehouseInInfoVO.volume : 0 }}m³</span>
@@ -285,7 +286,7 @@ export default {
   name: "splitOrder",
   inheritAttrs: false,
   components: {
-    WorkFlow,
+    WorkFlow
   },
   props: {
     currRow: Object,

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -692,6 +692,22 @@ export default {
                   this.queryAllData();
                 });
             }
+            
+            if (res.code === 566) {
+              this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
+                type: "warning",
+              })
+                .then((_) => {
+                  createGoods({ ...params, relationStatus: 2 }).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.queryAllData();
+                    });
+                  });
+                })
+                .catch((_) => {
+                  this.queryAllData();
+                });
+            }
           });
       } else {
         let params = {

src/views/ecw/channel/index.vue

@@ -126,7 +126,7 @@
 import { createChannel, updateChannel, deleteChannel, getChannel, getChannelPage, exportChannelExcel } from "@/api/ecw/channel";
 
 export default {
-  name: "Channel",
+  name: "EcwChannelIndex",
   components: {
   },
   data() {
@@ -163,6 +163,9 @@ export default {
   created() {
     this.getList();
   },
+  activated() {
+    this.getList();
+  },
   methods: {
     /** 查询列表 */
     getList() {

src/views/ecw/customer/query.vue

@@ -50,7 +50,7 @@
               <el-image v-show="!!customer.picture" :src="customer.picture" style="width: 100px;height: 100px"></el-image>
             </el-descriptions-item>
             <el-descriptions-item :label="$t('备注')">{{ customer.remarks  }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('新老客户')">{{ customer.isNew ?$t('新客户') : $t('老客户')  }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('业绩类型')">{{ customer.isNew ?$t('新客户') : $t('老客户')  }}</el-descriptions-item>
             <el-descriptions-item :label="$t('付款人姓名')">{{ customer.payerName  }}</el-descriptions-item>
             <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证姓名')">{{ customer.carName }}</el-descriptions-item>
             <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证号码')">{{ customer.carNo }}</el-descriptions-item>

src/views/ecw/deptTarget/allAchievement.vue

@@ -73,6 +73,7 @@
               <dict-tag :type="DICT_TYPE.CUSTOMER_ESOURCE_TYPE" :value="scope.row.customerType"/>
             </template>
           </el-table-column>
+      <el-table-column :label="$t('业绩类型')" align="center" prop="achieveType"/>
       <el-table-column :label="$t('报价单号')" align="center" width="180">
         <template slot-scope="scope">
           <span>{{scope.row.number}}</span>
@@ -130,7 +131,7 @@
     import {listServiceUser} from "@/api/system/user";
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetAllachievement",
         components: {},
         data() {
             return {
@@ -219,6 +220,10 @@
                 }
             }
         },
+      activated() {
+        this.getChannelList();
+        this.getList();
+      },
       created() {
             this.getChannelList();
             this.getList();

src/views/ecw/deptTarget/index.vue

@@ -154,7 +154,7 @@
 import { parseTime } from '@/utils/ruoyi';
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetIndex",
         components: {},
         data() {
             return {
@@ -266,6 +266,10 @@ import { parseTime } from '@/utils/ruoyi';
             this.getChannelList();
             this.getList();
         },
+      activated() {
+        this.getChannelList();
+        this.getList();
+      },
       methods: {
           /** 查询部门列表 */
           getDeptList(){

src/views/ecw/deptTarget/myAchievement.vue

@@ -71,6 +71,7 @@
               <dict-tag :type="DICT_TYPE.CUSTOMER_ESOURCE_TYPE" :value="scope.row.customerType"/>
             </template>
           </el-table-column>
+      <el-table-column :label="$t('业绩类型')" align="center" prop="achieveType"/>
       <el-table-column :label="$t('报价单号')" align="center" width="180">
         <template slot-scope="scope">
           <span>{{scope.row.number}}</span>
@@ -126,7 +127,7 @@
     import {listServiceUser} from "@/api/system/user";
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetMyachievement",
         components: {},
         data() {
             return {
@@ -215,6 +216,10 @@
                 }
             }
         },
+      activated() {
+        this.getChannelList();
+        this.getList();
+      },
       created() {
             this.getChannelList();
             this.getList();

src/views/ecw/deptTarget/myDeptAchievement.vue

@@ -70,6 +70,7 @@
               <dict-tag :type="DICT_TYPE.CUSTOMER_ESOURCE_TYPE" :value="scope.row.customerType"/>
             </template>
           </el-table-column>
+      <el-table-column :label="$t('业绩类型')" align="center" prop="achieveType"/>
       <el-table-column :label="$t('报价单号')" align="center" width="180">
         <template slot-scope="scope">
           <span>{{scope.row.number}}</span>
@@ -126,7 +127,7 @@
     import {listServiceUser} from "@/api/system/user";
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetMydeptachievement",
         components: {},
         data() {
             return {

src/views/ecw/deptTarget/myDeptTarget.vue

@@ -155,7 +155,7 @@
 import { parseTime } from '@/utils/ruoyi';
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetMydepttarget",
         components: {},
         data() {
             return {
@@ -267,13 +267,17 @@ import { parseTime } from '@/utils/ruoyi';
             this.getChannelList();
             this.getList();
         },
+      activated() {
+        this.getChannelList();
+        this.getList();
+      },
       methods: {
           /** 查询部门列表 */
           getDeptList(){
             this.loading = true;
             myListDept(this.queryParams).then(response => {
               this.deptList = this.handleTree(response.data, "id");
-              console.log("this.deptList:"+JSON.stringify(this.deptList));
+              // console.log("this.deptList:"+JSON.stringify(this.deptList));
               this.deptList.forEach((item) => {
                 this.normalizer(item);
                 // this.deptData.push(item);

src/views/ecw/order/components/SplitRevokeDetail.vue

@@ -21,6 +21,11 @@
           {{row.sumNum}}{{$t('箱')}}<br/>{{row.sumVolume}}m³<br/>{{row.sumWeight}}kg
         </template>
       </el-table-column>
+      <el-table-column :label="$t('收费统计')">
+        <template slot-scope="{row}">
+          {{row.sumNum}}{{$t('箱')}}<br/>{{row.wvolume}}m³<br/>{{row.vweight}}kg
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('入仓时间')">
         <template slot-scope="{row}">
           {{row.rucangTime|parseTime}}

src/views/ecw/order/index.vue

@@ -64,7 +64,7 @@
         <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType"  clearable/>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" >
-        <user-selector v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
+        <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('订单状态')" prop="status">
         <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
@@ -352,13 +352,12 @@
                 <el-button type="text">{{$t('仓库')}}</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <!-- 入仓操作 -->
-                  <template v-if="include(scope.row.status, [0,2]) || include(scope.row.abnormalState, [1]) || scope.row.inWarehouseState == 208">
+                  <template v-if="include(scope.row.status, [0,2]) || scope.row.inWarehouseState == 208">
                     <el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_add']">{{$t('入仓操作')}}</el-dropdown-item>
                   </template>
                   <!-- 入仓补充 -->
                   <template v-if="
                     include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 214, 215, 216]) &&
-                    scope.row.abnormalState != 1 &&
                     include(scope.row.status, [2,3,5,10,9,8])
                     ">
                     <el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_replenish']">{{$t('入仓补充')}}</el-dropdown-item>

src/views/ecw/order/splitApply.vue

@@ -242,10 +242,10 @@
              </el-select>
         </el-form-item>
         <el-form-item :label2="$t('剩余箱数')" v-if="mainOrderItem.orderItemId">
-          剩余箱数{{ shopForm.sum || 0 }}，可放入箱数：{{ mainOrderItem.num - 1 }}
+          剩余箱数{{ shopForm.sum || 0 }}<!--，可放入箱数：{{ mainOrderItem.num - 1 }}-->
         </el-form-item>
         <el-form-item :label="$t('放入箱数')">
-           <el-input-number v-model="shopForm.num" @change="numChange" controls-position="right"  :min="1" :max="mainOrderItem.num-1"></el-input-number>
+           <el-input-number v-model="shopForm.num" @change="numChange" controls-position="right"  :min="1" :max="mainOrderItem.num"></el-input-number>
         </el-form-item>
         <el-form-item v-if="quantityshow" :label="$t('放入数量')+'('+$t('个')+')'">
            <el-input-number v-model="shopForm.quantity" controls-position="right" :min="1" :max="mainOrderItem.quantity-1" :placeholder="$t('最多可放入{quantity}', {
@@ -253,24 +253,24 @@
            })"></el-input-number>
         </el-form-item>
         <el-form-item v-if="mainOrderItem.orderItemId">
-          <div>{{ $t('剩余入仓方数') }}：{{ mainOrderItem.volume || 0 }}m³，{{$t('可放入仓方数')}}：{{ (mainOrderItem.volume - 0.01).toFixed(2) }}m³</div>
-          <div>{{$t('剩余收费方数')}}：{{ mainOrderItem.chargeVolume || 0 }}m³，{{$t('可放入收费方数')}}：{{ (mainOrderItem.chargeVolume - 0.01).toFixed(2) }}m³</div>
+          <div>{{ $t('剩余入仓方数') }}：{{ mainOrderItem.volume || 0 }}m³<!--，{{$t('可放入仓方数')}}：{{ (mainOrderItem.volume - 0.01).toFixed(2) }}m³--></div>
+          <div>{{$t('剩余收费方数')}}：{{ mainOrderItem.chargeVolume || 0 }}m³<!--，{{$t('可放入收费方数')}}：{{ (mainOrderItem.chargeVolume - 0.01).toFixed(2) }}m³--></div>
         </el-form-item>
         <el-form-item :label="$t('入仓方数')">
-          <el-input-number v-model="shopForm.volume" controls-position="right"  :min="0" :max="(mainOrderItem.volume - 0.01).toFixed(2)"></el-input-number>
+          <el-input-number v-model="shopForm.volume" controls-position="right"  :min="0" :max="mainOrderItem.volume"></el-input-number>
         </el-form-item>
         <el-form-item :label="$t('收费方数')">
-          <el-input-number v-model="shopForm.chargeVolume" controls-position="right" :min="0" :max="(mainOrderItem.chargeVolume - 0.01).toFixed(2)"></el-input-number>
+          <el-input-number v-model="shopForm.chargeVolume" controls-position="right" :min="0" :max="mainOrderItem.chargeVolume"></el-input-number>
         </el-form-item>
        <el-form-item v-if="mainOrderItem.orderItemId">
-         <div>{{$t('剩余入仓重量')}}：{{ mainOrderItem.weight || 0 }}kg，{{$t('可放入重量')}}：{{ (mainOrderItem.weight - 0.01).toFixed(2) }}kg</div>
-         <div>{{$t('剩余收费重量')}}：{{ mainOrderItem.chargeWeight || 0 }}kg，{{$t('可放入收费重量')}}：{{ (mainOrderItem.chargeWeight - 0.01).toFixed(2) }}kg</div>
+         <div>{{$t('剩余入仓重量')}}：{{ mainOrderItem.weight || 0 }}kg<!--，{{$t('可放入重量')}}：{{ mainOrderItem.weight }}kg--></div>
+         <div>{{$t('剩余收费重量')}}：{{ mainOrderItem.chargeWeight || 0 }}kg<!--，{{$t('可放入收费重量')}}：{{ mainOrderItem.chargeWeight }}kg--></div>
        </el-form-item>
         <el-form-item :label="$t('入仓重量')">
-          <el-input-number v-model="shopForm.weight" controls-position="right"  :min="0" :max="(mainOrderItem.weight - 0.01).toFixed(2)"></el-input-number>
+          <el-input-number v-model="shopForm.weight" controls-position="right"  :min="0" :max="mainOrderItem.weight"></el-input-number>
         </el-form-item>
         <el-form-item :label="$t('收费重量')">
-          <el-input-number v-model="shopForm.chargeWeight" controls-position="right"  :min="0" :max="(mainOrderItem.chargeWeight - 0.01).toFixed(2)"></el-input-number>
+          <el-input-number v-model="shopForm.chargeWeight" controls-position="right"  :min="0" :max="mainOrderItem.chargeWeight"></el-input-number>
         </el-form-item>
 
         <el-form-item :label="$t('备注信息')+':'">

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -977,8 +977,10 @@ export default {
           this.$modal.msgSuccess(this.$t("新增成功"))
           if (this.activeName === 'first') {
             this.form.prodId = response.data
+            this.form.prodAttrIds = this.productForm.attrArray
           } else {
             this.form1.prodId = response.data
+            this.form1.prodAttrIds = this.productForm.attrArray
           }
           this.productCancel()
         })