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

src/views/bpm/processInstance/index.vue

@@ -2,11 +2,8 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="流程名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="所属流程" prop="processDefinitionId">
-        <el-input v-model="queryParams.processDefinitionId" placeholder="请输入流程定义的编号" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="流程名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="流程名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="流程分类" prop="category">
         <el-select v-model="queryParams.category" placeholder="请选择流程分类" clearable>

src/views/bpm/task/todo.vue

@@ -2,8 +2,8 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="流程名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="任务名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入任务名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="流程分类" prop="category">
         <el-select v-model="queryParams.category" placeholder="请选择流程分类" clearable>

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

@@ -133,7 +133,14 @@
   <div v-if="type === 4">
     <p>申请理由</p>
     <div>
-      {{ FeeDetails.details || '' }}
+      用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ FeeDetails.details.applyInfoVOList[0].newValue }}】信息：
+      <ol>
+        <template v-for="item in FeeDetails.details.applyInfoVOList">
+          <li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li>
+          <li v-else-if="item.newValue === undefined">删除入仓</li>
+          <li v-else-if="item.newValue !== item.orgValue">{{ item.name }}从【{{ item.orgValue }}】改为【{{ item.newValue }}】</li>
+        </template>
+      </ol>
     </div>
   </div>
 </div>

src/views/ecw/order/splitApply.vue

@@ -290,6 +290,7 @@ export default {
       form:{
 
       },
+      importCityList:[],
       selectedUsers:[],
       shopOpen:false,
 
@@ -318,7 +319,10 @@ export default {
   },
   created() {
     this.getChannel()
-    getWarehouseList().then(res => this.tradeCityList = res.data)
+    getWarehouseList().then(res => {
+      this.tradeCityList = res.data
+      this.importCityList = this.tradeCityList.filter(item => item.type == 1)
+    })
     if (this.$route.query.orderId) {
       this.queryParams.orderId = this.$route.query.orderId
     }
@@ -352,9 +356,6 @@ export default {
     },
     getDictDatas(){
         return getDictDatas
-    },
-    importCityList(){
-        return this.tradeCityList.filter(item => item.type == 1)
     }
   },
   methods: {
@@ -454,6 +455,16 @@ export default {
       this.shopOpen = true
     },
     addSplit(){
+      this.form.transportId = this.orderData.transportId
+      this.form.destWarehouseId = this.orderData.destWarehouseId
+      if(this.orderData.logisticsInfoDto&&this.orderData.logisticsInfoDto.destTitleZh){
+        this.form.destWarehouseId = this.importCityList.find(item=>item.titleZh==this.orderData.logisticsInfoDto.destTitleZh).id
+        if(this.orderData.logisticsInfoDto&&this.orderData.logisticsInfoDto.channelId){
+          this.form.channelId = this.orderData.logisticsInfoDto.channelId
+          }
+
+      }
+
       this.open = true
     },
     changeProdTitleZh(){

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

@@ -372,20 +372,20 @@ export default {
       opened: false,
       brandList: [],
       form: {
-        "brand": "0",
-        "brandType": 0,
-        "inTime": "",
-        "material": "",
-        "orderId": 0,
-        "orderItemId": 0,
-        "orderNo": "",
+        // "brand": "0",
+        // "brandType": 0,
+        // "inTime": "",
+        // "material": "",
+        // "orderId": 0,
+        // "orderItemId": 0,
+        // "orderNo": "",
         "orderWarehouseInItemDoList": [],
         "prodAttrIds": "",
         "prodId": 0,
-        "prodTitleEn": "",
-        "prodTitleZh": "",
-        "prodType": 0,
-        "type": 0,
+        // "prodTitleEn": "",
+        // "prodTitleZh": "",
+        // "prodType": 0,
+        // "type": 0,
         feeType: 0,
         recordMode: undefined
       },
@@ -533,7 +533,16 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: this.warehousing.orderItemId,
               orderNo: this.warehousing.orderNo,
-              "orderWarehouseInUpdateItemDoList": orderWarehouseInItemDoList,
+              cartonsNum: this.warehousing.num,
+              volume: this.warehousing.volume.toFixed(2),
+              weight: this.warehousing.weight.toFixed(2),
+              prodId: this.warehousing.prodId,
+              "orderWarehouseInUpdateItemDoList": this.tableData.map(e => {
+                return {
+                  ...e,
+                  boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3
+                }
+              }),
               copyUserId: this.selectedUsers
             }).then(r => {
               if (r.data) {