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/offer/components/Commossion.vue

@@ -61,7 +61,7 @@
           <template v-if="darkCommission">
             {{$t('暗佣')}}：{{darkCommission}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
           </template>
-          <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + customerId)">去设置</el-link>
+          <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + offer.relationId)">去设置</el-link>
         </div>
 
         <div  v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{form.orgSeaFreight + form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}</div>

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/edit.vue

@@ -406,8 +406,9 @@
                 <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">{{$t('审核中')}}</el-button>
             </template>
             <template v-else>
-                <el-button type="primary" @click="submitForm(0)">{{$t('保存')}}</el-button> <!--草稿-->
-                <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId">{{$t('新建')}}</el-button> <!--待入仓-->
+                <el-button type="primary" @click="submitForm(0)" v-if="!form.status">{{$t('保存草稿')}}</el-button> <!--草稿-->
+                <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId || !form.status">{{$t('新建订单')}}</el-button> <!--待入仓-->
+                <el-button type="primary" @click="submitForm(2)" v-else>{{$t('保存订单')}}</el-button> <!--修改-->
             </template>
             <el-button @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
         </el-form-item>

src/views/ecw/order/special/Commission.vue

@@ -67,7 +67,7 @@
           <template v-if="darkCommission">
             {{$t('暗佣')}}：{{darkCommission}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
           </template>
-          <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + customerId)">{{$t('去设置')}}</el-link>
+          <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + order.customerId)">{{$t('去设置')}}</el-link>
         </div>
 
         <div  v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{Decimal(form.freight).plus(form.lightCommissionAmount) }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div>

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) {

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

@@ -101,12 +101,12 @@
 
       <h2>订单数据</h2>
       <el-form-item label="总方数" style="width: 300px">
-        <el-input v-model="form.sumVolume" placeholder="请输入总方数">
+        <el-input v-model="form.sumVolume" placeholder="请输入总方数" readonly>
           <span slot="append">m³</span>
         </el-input>
       </el-form-item>
       <el-form-item label="总重量" style="width: 300px">
-        <el-input v-model="form.sumWeight" placeholder="请输入总重量">
+        <el-input v-model="form.sumWeight" placeholder="请输入总重量" readonly>
           <span slot="append">kg</span>
         </el-input>
       </el-form-item>