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

src/views/bpm/task/copy.vue

 <template>
   <div class="app-container">
-    <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="流程名" prop="processName">
@@ -20,8 +18,8 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="任务编号" align="center" prop="taskId" width="320" />
-      <el-table-column label="任务名称" align="center" prop="title" />
-      <el-table-column label="所属流程" align="center" prop="processName" />
+      <el-table-column label="流程分类" align="center" prop="title" />
+      <el-table-column label="流程名称" align="center" prop="processName" />
       <el-table-column label="流程发起人" align="center" prop="originatorName" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">

src/views/ecw/customer/edit.vue

-<template>
+<template xmlns="">
   <div>
 
     <el-row type="flex" style="margin-top: 15px;margin-bottom: 15px" justify="center">
@@ -264,6 +264,11 @@
                 prop=""
                 label="关联账号"
               >
+               <template v-slot = "{row}">
+                 <el-select v-model="row.userid" @change="selectBD">
+                   <el-option v-for="(item,index) in memberList" :value="item.id" :key="item.id"  :label="item.nickname + '(' + item.mobile + ')'" ></el-option>
+                 </el-select>
+               </template>
               </el-table-column>
               <el-table-column
                 prop="social"
@@ -370,7 +375,7 @@
 <script>
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import upload from '@/components/ImageUpload'
-import {createCustomer, getCustomer, updateCustomer, } from '@/api/ecw/customer'
+import {createCustomer, getCustomer, updateCustomer, userMemberUserList,} from '@/api/ecw/customer'
 import {getNodeList} from "@/api/ecw/node"
 import { getProductTypeList } from '@/api/ecw/productType'
 import { getProductList } from '@/api/ecw/product'
@@ -382,6 +387,7 @@ import {listServiceUser} from "@/api/system/user"
 import {getZhongPaoPage} from '@/api/ecw/zhongPao'
 import { getCustomerContactsListByCustomer } from '@/api/ecw/customerContacts'
 import { getCountryListAll } from '@/api/ecw/country'
+import Template from "@/views/cms/template";
 
 export default {
   name: "edit",
@@ -389,6 +395,7 @@ export default {
     customerId: String
   },
   components: {
+    Template,
     upload,
     CustomerLineTable
   },
@@ -426,6 +433,9 @@ export default {
     getCountryListAll().then(r => {
       this.countryList = r.data
     })
+    userMemberUserList().then(r => {
+      this.memberList = r.data
+    })
 
     this.getZhongPao()
   },
@@ -464,10 +474,14 @@ export default {
 
       zhongLines: [], // 重货线路
       paoLines: [], // 泡货线路
+      memberList:[],//会员列表
     }
   },
 
   methods: {
+    selectBD(){
+      this.$forceUpdate();
+    },
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -479,6 +493,9 @@ export default {
         if (!valid) {
           return;
         }
+        this.form.customerContacts.forEach(e => {
+          e.userid = e.userid.join(',')
+        })
         // 修改的提交
         if (this.form.id != null) {
           this.form.customerContacts.forEach(e => {
@@ -572,7 +589,7 @@ export default {
         "position": "",
         "social": undefined,
         "socialNumber": "",
-        // "userid": 0,
+        "userid": [],
         // "username": ""
       })
     },
@@ -592,7 +609,7 @@ export default {
   computed: {
     productListFilter(){
       return this.productList.filter((p) => p.typeId === this.form.productType)
-    }
+    },
   },
   watch: {
     zhongLines() {

src/views/ecw/order/addAssociatedOrder.vue

@@ -25,7 +25,13 @@
       <el-table-column label="订单号" prop="orderNo"></el-table-column>
       <el-table-column label="唛头" prop="marks"></el-table-column>
       <el-table-column label="货物数据">
-
+        <template v-slot="{row}">
+          <div v-if="row.costVO">
+            箱数：{{row.costVO.totalNum}}
+            {{row.costVO.totalVolume}}m³
+            {{row.costVO.totalWeight}}kg
+          </div>
+        </template>
       </el-table-column>
       <el-table-column label="入仓时间" prop="rucangTime"></el-table-column>
       <el-table-column label="状态">

src/views/ecw/order/associatedOrder.vue

@@ -32,13 +32,13 @@
        width="55">
      </el-table-column>
      <el-table-column type="index" label="序号"></el-table-column>
-     <el-table-column label="订单号" prop="orderNo"></el-table-column>
+     <el-table-column label="订单号" prop="orderBackVO.orderNo"></el-table-column>
      <el-table-column label="唛头" prop="marks"></el-table-column>
      <el-table-column label="货物数据"></el-table-column>
-     <el-table-column label="入仓时间" prop="remarks"></el-table-column>
+     <el-table-column label="入仓时间"></el-table-column>
      <el-table-column label="状态" prop="status" >
        <template v-slot:default="scope">
-         <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
+         <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
        </template>
      </el-table-column>
      <el-table-column label="操作人"></el-table-column>

src/views/ecw/order/batchSingleApplication.vue

@@ -10,7 +10,13 @@
         </template>
       </el-table-column>
       <el-table-column label="下单统计">
-
+        <template v-slot="{row}">
+          <div v-if="row.costVO">
+            箱数：{{row.costVO.totalNum}}
+            {{row.costVO.totalVolume}}m³
+            {{row.costVO.totalWeight}}kg
+          </div>
+        </template>
       </el-table-column>
       <el-table-column label="入仓统计" width="150">
        <template v-slot="{row}">
@@ -30,7 +36,7 @@
       <el-table-column label="出货渠道">
 
       </el-table-column>
-      <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>
+<!--      <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>-->
       <el-table-column label="目的地" prop="objectiveName"></el-table-column>
       <el-table-column label="发货人">
         <template v-slot="{row}">
@@ -68,13 +74,8 @@
       审批流程
     </h1>
     <div style="padding: 20px">
-      <my-process-viewer  key="designer" v-model="bpmnXML" v-bind="bpmnControlForm" />
+      <work-flow xmlkey="warehouse_transfer" v-model="params.copyUserId"  />
     </div>
-    <div style="height: 100px"></div>
-<!--    <el-form label-width="200px">-->
-<!--      <el-form-item label="抄送"></el-form-item>-->
-<!--      <el-form-item label="抄送人"></el-form-item>-->
-<!--    </el-form>-->
     <div style="text-align: center">
       <el-button style="margin-right: 50px" @click="submit"  :disabled="isSubmit">提交申请</el-button>
       <el-button @click="$router.push('/order/order')">取消</el-button>
@@ -93,22 +94,21 @@ import {
 import {getProcessDefinitionBpmnXMLByKey} from "@/api/bpm/definition";
 import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
 import {getOrderPage} from "@/api/ecw/order";
+import workFlow from "@/components/WorkFlow";
 export default {
   name: "batchSingleApplication",
   props:{
     orderList:String,
   },
   components:{
-    warehouseDetails
+    warehouseDetails,
+    workFlow
   },
   created() {
     getOrderPage({orderIdList:this.orderList}).then(r =>{
       this.list = r.data.list
       warehouseAdjustmentList({id:this.list[0].startWarehouseId}).then( r =>  this.availableWarehouse = r.data)
     })
-     getProcessDefinitionBpmnXMLByKey("warehouse_transfer").then(response => {
-      this.bpmnXML = response.data
-    })
   },
   computed:{
     isSubmit(){
@@ -125,6 +125,7 @@ export default {
   data(){
     return {
       list:[],
+      selectedUsers:[],
       availableWarehouse:[],
       DICT_TYPE,
       departureWarehouse:undefined,
@@ -132,11 +133,8 @@ export default {
       params:{
         orderIds:undefined,
         warehouseInId:undefined,
-        warehouseOutId: undefined
-      },
-      bpmnXML: null,
-      bpmnControlForm: {
-        prefix: "activiti"
+        warehouseOutId: undefined,
+        copyUserId:[],
       },
     }
   },

src/views/ecw/order/feeApplication.vue

@@ -60,7 +60,7 @@
          <el-button>取消</el-button>
        </div>
      <div style="padding: 20px">
-       <my-process-viewer  key="designer" v-model="bpmnXML" v-bind="bpmnControlForm" />
+       <work-flow xmlkey="free_apply" v-model="selectedUsers"  />
      </div>
   </div>
 </template>
@@ -69,10 +69,10 @@
 import {getOrder, feeApplicationCreate, ApplicationListByOrderId, applicationUpdate} from "@/api/ecw/order";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import Template from "@/views/cms/template";
-import { getProcessDefinitionBpmnXMLByKey} from "@/api/bpm/definition";
+import workFlow from "@/components/WorkFlow";
 export default {
   name: "feeApplication",
-  components: {Template},
+  components: {Template,workFlow},
   props:{
     orderId:[Number, String],
   },
@@ -85,10 +85,7 @@ export default {
       STATUS:{},
       isModify:[],
       isModifyIf:false,
-      bpmnXML: null,
-      bpmnControlForm: {
-        prefix: "activiti"
-      },
+      selectedUsers:[]
     }
   },
   created() {
@@ -100,10 +97,8 @@ export default {
     this.getOrderList()
     this.getDictDatas(this.DICT_TYPE.AUDIT_STATUS).forEach( e =>{
       this.STATUS[e.value] = e.label
-    }),
-      getProcessDefinitionBpmnXMLByKey("free_apply").then(response => {
-        this.bpmnXML = response.data
-      })
+    })
+
   },
   computed:{
     forbidden(){
@@ -142,10 +137,11 @@ export default {
         })
       }else {
         if(this.list[this.list.length - 1].status === 0){
-          feeApplicationCreate( {...this.list[this.list.length - 1],status:1}).then(r=>{
+          feeApplicationCreate( {...this.list[this.list.length - 1],status:1,copyUserId:this.selectedUsers.join(',')}).then(r=>{
             if(r.code === 0){
               this.getOrderList();
               this.$message.success('添加成功');
+              this.selectedUsers = [];
             }
           })
         }

src/views/ecw/order/withdrawal.vue

@@ -10,7 +10,7 @@
     <el-divider></el-divider>
     <h2>审批流程</h2>
     <div style="padding: 20px">
-      <my-process-viewer  key="designer" v-model="bpmnXML" v-bind="bpmnControlForm" />
+      <work-flow xmlkey="retired_warehouse" v-model="params.copyUserId"  />
     </div>
     <div>
       <el-button @click="submit" type="primary" style="margin-right: 20px;">确定退仓</el-button>
@@ -23,12 +23,16 @@
 import {getOrder} from "@/api/ecw/order";
 import {orderWarehouseInDelete} from "@/api/ecw/batchSingleApplication";
 import {getProcessDefinitionBpmnXMLByKey} from "@/api/bpm/definition";
+import workFlow from "@/components/WorkFlow";
 
 export default {
   name: "withdrawal",
   props:{
     orderId:String
   },
+  components:{
+    workFlow
+  },
   data(){
     return {
       orderDetails:{},
@@ -40,14 +44,12 @@ export default {
         orderId:undefined,
         orderNo:undefined,
         reason:'',
-      }
+        copyUserId:[]
+      },
     }
   },
   created() {
     getOrder(this.orderId).then(r => this.orderDetails = r.data);
-    getProcessDefinitionBpmnXMLByKey("retired_warehouse").then(response => {
-      this.bpmnXML = response.data
-    })
   },
   methods:{
     submit(){