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

src/views/ecw/box/ladingBill/index.vue

@@ -183,7 +183,7 @@ export default {
       }).then((res) => {
         const { data } = res;
         const { titleZh = "", contentZh = "" } = data?.ladingTemplate ?? {};
-        let billContent = `${titleZh}${contentZh}`,
+        let billContent = `${titleZh}${data.orderInfo}${contentZh}`,
           orderNo = data.orderInfo?.orderNo ?? "";
         this.currData = {
           billContent,

src/views/ecw/customer/index.vue

@@ -71,7 +71,7 @@
                    v-hasPermi="['ecw:customer:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5" >
-        <el-button :disabled="selectCustomerList.length === 0"  type="warning" plain icon="el-icon-download" size="mini" @click="transferShow = true;" :loading="exportLoading"
+        <el-button :disabled="selectCustomerList.length === 0"  type="primary" size="mini" @click="transferShow = true;" :loading="exportLoading"
                    v-hasPermi="['ecw:customer:export']">批量移交</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/ecw/customer/transferCustomer.vue

@@ -10,7 +10,7 @@
       </el-select>
     </div>
     <span slot="footer" class="dialog-footer">
-    <el-button >取 消</el-button>
+    <el-button @click="$emit('update:show',false)" >取 消</el-button>
     <el-button type="primary" @click="submit">确 定</el-button>
   </span>
   </el-dialog>

src/views/ecw/customerToBeAssigned/index.vue

@@ -73,7 +73,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-col :span="1.5" >
-          <el-button :disabled="selectCustomerList.length === 0"  type="warning"  size="mini" @click="batchTransferShow = true;" :loading="exportLoading"
+          <el-button :disabled="selectCustomerList.length === 0"  type="primary" size="mini" @click="batchTransferShow = true;" :loading="exportLoading"
                      v-hasPermi="['ecw:customer:export']">批量移交</el-button>
         </el-col>
       </el-col>

src/views/ecw/myCustomerService/index.vue

@@ -72,7 +72,7 @@
                    v-hasPermi="['ecw:customer:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button :disabled="selectCustomerList.length === 0" type="warning" plain icon="el-icon-download" size="mini" @click="show = true;" :loading="exportLoading"
+        <el-button :disabled="selectCustomerList.length === 0" type="primary" size="mini" @click="show = true;" :loading="exportLoading"
                    v-hasPermi="['ecw:customer:export']">批量移交</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/ecw/order/batchSingleApplication.vue

@@ -83,20 +83,36 @@
         <el-col :span="3"><div style="text-align:center">
           调至
         </div></el-col>
-        <el-col :span="8"><el-select v-model="params.warehouseInId">
-          <el-option v-for="(item ,index) in availableWarehouse" v-if="item.status !== 1"  :value="item.id" :label="item.titleZh"
+        <el-col :span="8"><el-select clearable v-model="params.warehouseInId">
+          <el-option  v-for="(item ,index) in availableWarehouse" v-if="item.status !== 1"  :value="item.id" :label="item.titleZh"
                      :key="index"></el-option>
         </el-select></el-col>
       </el-row>
-      <el-divider></el-divider>
-      <h1 class="title">
-        审批流程
-      </h1>
+      <el-divider contentPosition="left">调仓明细</el-divider>
+      <el-card class="box-card">
+          <el-table :data="warehouseList">
+            <el-table-column label="调仓编号" prop="id"></el-table-column>
+            <el-table-column label="调出仓库" prop="warehouseOutName" ></el-table-column>
+            <el-table-column label="调入仓库" prop="warehouseInName"></el-table-column>
+            <el-table-column label="申请人" prop="creatorName"></el-table-column>
+            <el-table-column label="申请时间">
+              <template v-slot="{row}">
+                {{parseTime(row.createTime)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="状态">
+              <template v-slot="{row}">
+                {{STATUS[row.status]}}
+              </template>
+            </el-table-column>
+          </el-table>
+      </el-card>
+      <el-divider contentPosition="left">审批流程</el-divider>
       <div style="padding: 20px">
         <work-flow xmlkey="warehouse_transfer" v-model="params.copyUserId"/>
       </div>
       <div style="text-align: center" v-if="!adjustmentBol">
-        <el-button style="margin-right: 50px" @click="submit">提交申请</el-button>
+        <el-button :disabled="!params.warehouseInId" style="margin-right: 50px" @click="submit">提交申请</el-button>
         <el-button @click="$emit('update:dialogVisible',false)">取消</el-button>
       </div>
       <div style="text-align: center" v-else>
@@ -120,7 +136,7 @@ import {
 } from "@/api/ecw/batchSingleApplication";
 import {getProcessDefinitionBpmnXMLByKey} from "@/api/bpm/definition";
 import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
-import {getOrderPage} from "@/api/ecw/order";
+import {getAdjustInfo, getOrderPage} from "@/api/ecw/order";
 import workFlow from "@/components/WorkFlow";
 import Template from "@/views/cms/template";
 import {arrryToKeyedObjectBy} from "@/utils";
@@ -142,11 +158,16 @@ export default {
   },
   created() {
     getChannelList().then(res => this.channelList = res.data)
+
     },
+
   watch: {
     dialogVisible(val) {
       if (val) {
         this.getOrderListFn()
+        getAdjustInfo({orderId:this.orderList,lang:0}).then(r => {
+          this.warehouseList = r.data
+        })
       } else {
         this.params = {
           orderIds: undefined,
@@ -175,6 +196,7 @@ export default {
   },
   data() {
     return {
+      STATUS : {1:'申请中', 2:'通过', 3:'不通过', 4:'已取消', 5:'已出仓',6:'已到仓'},
       list: [],
       selectedUsers: [],
       availableWarehouse: [],
@@ -188,7 +210,8 @@ export default {
         copyUserId: [],
       },
       applyStatus:{},//调仓-查看状态,
-      channelList:[]
+      channelList:[],
+      warehouseList:[]
 
     }
   },

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

@@ -6,8 +6,8 @@
       <h1>{{orderNo}} 特需</h1>
       <el-form label-width="180px" label-position="left">
         <el-form-item label="特殊要求">
-          <el-checkbox-group v-model="advanceType">
-            <el-checkbox v-for="(item) in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"  :label="item.value" >{{item.label}}</el-checkbox>
+          <el-checkbox-group v-model="advanceType" >
+            <el-checkbox @click="change(item)" v-for="(item) in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"  :label="item.value" >{{item.label}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="特殊要求备注"><el-input  type="textarea" style="width: 300px;" v-model="todoDetail"></el-input></el-form-item>
@@ -55,6 +55,7 @@ export default {
       advanceType:[],
       specialNeedsList:[],
       todoDetail:'',
+      echoList:[],
     }
   },
   methods:{
@@ -63,7 +64,25 @@ export default {
         i.todoDetail = this.todoDetail
       })
       let p = this.specialNeedsList.filter(i => this.advanceType.indexOf(i.advanceType) > -1)
-      specialNeedCreate(p).then(r=>{
+       console.log(p,'p')
+      let p1 = []
+      //获取新增的和修改的
+      p.forEach(item => {
+        if(this.echoList.find( i => item.id === i.id)){
+        p1.push(item)
+        }else {
+          item.oper = 'add'
+          p1.push(item)
+        }
+      })
+      //获取删除的
+      this.echoList.forEach(item => {
+       if(!(p.find(i => i.id === item.id))){
+         item.oper = 'del'
+          p1.push(item)
+       }
+      })
+      specialNeedCreate(p1).then(r=>{
         if(r.code === 0){
           this.$emit('update:show',false)
           this.$emit('determine')
@@ -86,6 +105,7 @@ export default {
          })
         //特需回显
         getSpecialListByOrderId(this.orderId).then(r => {
+          this.echoList = r.data;
           r.data.forEach(i => {
             this.advanceType.push(i.advanceType)
            let index = this.specialNeedsList.findIndex(item => i.advanceType == item.advanceType)

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

@@ -241,8 +241,12 @@ export default {
           break;
         case 4:
           // 入仓修改
-          getWarehouseUpdateApprovalInfo(this.processInstanceID).then(r => {
-            this.FeeDetails.details = r.data.details
+          getWarehouseUpdateApprovalInfo(this.processInstanceID).then(res => {
+            getOrder(res.data.orderIds).then(r =>{
+              this.FeeDetails = r.data
+              this.FeeDetails.details = JSON.parse(res.data.details)
+              // this.FeeDetails.details = res.data.details
+            })
           })
           break
       }