解决冲突

src/components/OrderBaseInfo/index.vue

@@ -4,7 +4,6 @@
       <el-descriptions-item label="唛头">{{ order.marks }}</el-descriptions-item>
       <el-descriptions-item label="已到箱数/总箱数">{{ order.sumNum }}/{{ order.costVO.totalNum }}</el-descriptions-item>
       <el-descriptions-item label="订单状态"><dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" :class="{red: order.status === 1, green: order.status === 5 || order.status === 2}" /></el-descriptions-item>
-      <el-descriptions-item label="送货时间">{{ order.deliveryDate || '' }}</el-descriptions-item>
       <el-descriptions-item label="运输方式">
         <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.logisticsInfoDto.transportId"></dict-tag>
       </el-descriptions-item>
@@ -16,6 +15,7 @@
       <el-descriptions-item label="收货人姓名">{{ order.consigneeVO && order.consigneeVO.name || ''}}</el-descriptions-item>
       <el-descriptions-item label="收货人公司">{{ order.consigneeVO && order.consigneeVO.company || '' }}</el-descriptions-item>
       <el-descriptions-item label="收货人电话">{{ order.consigneeVO &&(order.consigneeVO.countryCode + order.consigneeVO.phone) || '' }}</el-descriptions-item>
+      <el-descriptions-item label="送货时间">{{ order.deliveryDate || '' }}</el-descriptions-item>
       <el-descriptions-item label="入仓类型">{{ getDictDataLabel(DICT_TYPE.ECW_WAREHOUSING_TYPE, order.warehouseType) }}</el-descriptions-item>
       <el-descriptions-item label="订单号">{{ order.orderNo }}</el-descriptions-item>
     </el-descriptions>

src/views/bpm/task/copy.vue

@@ -2,12 +2,21 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('任务名称')" prop="processName">
-        <el-input v-model="queryParams.processName" :placeholder="$t('请输入任务名称')" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="任务编号" prop="processId">
+        <el-input v-model="queryParams.instanceId" placeholder="请输入任务编号" clearable/>
+      </el-form-item>
+      <el-form-item label="流程分类" prop="processName">
+        <el-select v-model="queryParams.categoryId" placeholder="请选择流程分类" clearable>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="流程名称" prop="processName">
+        <el-input v-model="queryParams.processName" placeholder="请输入流程名称" clearable/>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
@@ -17,11 +26,15 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('任务编号')" align="center" prop="taskId" width="320" />
-      <el-table-column :label="$t('流程分类')" align="center" prop="title" />
-      <el-table-column :label="$t('任务名称')" align="center" prop="processName" />
-      <el-table-column :label="$t('流程发起人')" align="center" prop="originatorName" />
-      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
+      <el-table-column label="任务编号" align="center" prop="instanceId" width="320"/>
+      <el-table-column label="流程分类" align="center" prop="categoryId">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.categoryId" />
+        </template>
+      </el-table-column>
+      <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">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -29,7 +42,8 @@
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
-                     v-hasPermi="['bpm:task:query']">{{$t('详情')}}</el-button>
+                     v-hasPermi="['bpm:task:query']">详情
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -45,8 +59,7 @@ import {getCopyTaskPage} from '@/api/bpm/task'
 
 export default {
   name: "Copy",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -62,7 +75,10 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 10,
-        name: null,
+        instanceId: null,
+        categoryId: null,
+        processName: null
+
       },
     };
   },
@@ -94,7 +110,7 @@ export default {
       this.handleQuery();
     },
     handleAudit(row) {
-      this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.instanceId}});
+      this.$router.push({path: "/bpm/process-instance/detail", query: {id: row.instanceId}});
     },
   }
 };

src/views/ecw/financial/creatCollection.vue

@@ -476,9 +476,9 @@
             />
           </el-form-item>
 
-          <el-form-item label="自编号" prop="orderNo">
+          <el-form-item label="自编号" prop="selfNo">
             <el-input
-              v-model="queryParams.orderNo"
+              v-model="queryParams.selfNo"
               placeholder="请输入自编号"
               clearable
               @keyup.enter.native="handleQuery"
@@ -1184,6 +1184,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.page = 1;
+      this.getList()
     },
   },
 };

src/views/ecw/financial/creatPayment.vue

@@ -348,9 +348,9 @@
             />
           </el-form-item>
 
-          <el-form-item label="自编号" prop="orderNo">
+          <el-form-item label="自编号" prop="selfNo">
             <el-input
-              v-model="queryParams.orderNo"
+              v-model="queryParams.selfNo"
               placeholder="请输入自编号"
               clearable
             />
@@ -631,7 +631,10 @@ export default {
       t && (this.form.supplierName = t.companyZh)
       // t && (this.bankData = t.bankList)
     },
-    handleQuery() {},
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList()
+    },
     UStoRMB() {
       return NP.divide(this.currencyList.find(v => v.titleEn === 'USD').huilv, 100).toFixed(6)
     },

src/views/ecw/financial/voucher.vue

@@ -115,12 +115,17 @@
       </el-table-column>
       <el-table-column label="收款单号" align="center" prop="receiptNo">
         <template slot-scope="scope">
-          <span>{{scope.row.receiptNo}}</span>
+          <span style="color: #1890ff;" @click="verificationCancelClick(scope.row)">{{scope.row.receiptNo}}</span>
           <!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
         </template>
       </el-table-column>
       <!-- <el-table-column label="自编号" align="center" prop="orderNo" /> -->
-      <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column label="订单号" align="center" prop="orderNo">
+        <template slot-scope="scope">
+            <span style="color: #1890ff;" @click="verificationCancelClick(scope.row)">{{scope.row.orderNo}}</span>
+            <!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
+          </template>
+        </el-table-column>
       <el-table-column label="客户名称" align="center" prop="customerName" />
       <el-table-column label="创建日期" align="center" prop="createTime">
         <template slot-scope="scope">

src/views/ecw/order/prepayDeal.vue

@@ -95,7 +95,7 @@
             <el-table-column label="实收金额" prop="volume" /> -->
             <el-table-column :label="$t('付款人')">
               <template slot-scope="scope">
-               <span>{{srope.row.consigneeName}}({{$t('收货人')}})</span>
+               <span>{{scope.row.consigneeName}}({{$t('收货人')}})</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('付款状态')" prop="worth">
@@ -292,7 +292,8 @@
         orderExceptionId:0,
         handlerParams:{
           orderExceptionId:0,
-          orderExceptionStatus:"1"
+          orderExceptionStatus:"1",
+          orderExceptionHandlerResult:''
         },
         shopData:{},
         //发货/收货人信息

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

@@ -296,8 +296,18 @@
       </div>
 
       <span slot="footer">
-        <el-button @click="opened = false">关 闭</el-button>
-        <el-button type="primary" @click="handleSubmit()">{{ edit ? '确认修改' : '提 交' }}</el-button>
+        <template v-if="true">
+          <el-button @click="opened = false">关 闭</el-button>
+          <el-button type="primary" @click="handleSubmit()">{{ edit ? '确认修改' : '提 交' }}</el-button>
+        </template>
+        <template v-else>
+          <el-button type="primary">审核中</el-button>
+          <el-button type="primary">取消审核</el-button>
+          <el-button @click="opened = false">返回</el-button>
+        </template>
+        <template v-else>
+
+        </template>
       </span>
     </el-dialog>
   </div>

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

@@ -133,7 +133,7 @@
           <el-button type="primary" @click="handleLabelSubmit">修改箱号</el-button>
         </div>
       </template>
-      <div style="text-align: center;margin-top: 15px" v-if="order.status !== 5">
+      <div style="text-align: center;margin-top: 15px" v-if="!isEdit">
         <el-button @click="escapeBol = true;" type="primary">转异</el-button>
         <el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
       </div>