Merge remote-tracking branch 'origin/dev' into dev

src/views/bpm/processInstance/detail.vue

@@ -160,6 +160,10 @@ export default {
         return false
       }
       const map = {
+      "shippingDetail": {
+          component: "shippingDetail",
+          processId: this.processInstance.businessKey,
+        },
         // 报价单特价审核，原来配置的组件名
         "special-discount": {
           component: 'OfferSpecialDetail',

src/views/bpm/processInstance/index.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="name">

src/views/bpm/task/done.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="name">

src/views/bpm/task/todo.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="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>
+          <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="businessNo">
+        <el-input v-model="queryParams.businessNo" placeholder="请输入业务编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -19,10 +26,16 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="任务编号" align="center" prop="id" width="320" />
-      <el-table-column label="任务名称" align="center" prop="name" />
-      <el-table-column label="所属流程" align="center" prop="processInstance.name" />
-      <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" />
+      <el-table-column label="任务编号" align="center" prop="id" width="320"/>
+      <el-table-column label="业务编号" align="center" prop="businessNo"/>
+      <el-table-column label="流程分类" align="center" prop="category">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="所属流程" align="center" prop="processInstance.name"/>
+      <el-table-column label="当前审批任务" align="center" prop="name"/>
+      <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -37,7 +50,8 @@
       <el-table-column label="操作" 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:update']">审批</el-button>
+                     v-hasPermi="['bpm:task:update']">审批
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -50,12 +64,10 @@
 
 <script>
 import {getTodoTaskPage} from '@/api/bpm/task'
-import {listSimpleUsers} from "@/api/system/user";
 
 export default {
   name: "Todo",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -72,6 +84,8 @@ export default {
         pageNo: 1,
         pageSize: 10,
         name: null,
+        businessNo: null,
+        category: null,
       },
     };
   },
@@ -104,7 +118,7 @@ export default {
     },
     /** 处理审批按钮 */
     handleAudit(row) {
-      this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.processInstance.id}});
+      this.$router.push({path: "/bpm/process-instance/detail", query: {id: row.processInstance.id}});
     },
   }
 };

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -606,6 +606,7 @@ export default {
       const { rucangtime = [] } = this.queryParams;
       return {
         ...this.queryParams,
+        ...this.$attrs.params,
         rucangTimeStart: rucangtime[0]
           ? dayjs(rucangtime[0]).format("YYYY-MM-DD 00:00:00")
           : rucangtime[0],

src/views/ecw/box/shippingSeaAir/shippingSeaAir.vue

@@ -26,7 +26,7 @@
         </el-card>
 
         <!-- 海运流程图 -->
-        <seaProcess :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" width="50px" height="50px" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" @getBoxInfo="getBoxInfo" />
+        <seaProcess :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" width="50px" height="50px" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" :params="{transportType:4}" @getBoxInfo="getBoxInfo" />
 
         <!-- 海运步骤图 -->
         <seaStepDetail :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />

src/views/ecw/financial/creatCollection.vue

@@ -606,7 +606,7 @@
           <el-input v-model="discountForm.discountRemark" type="textarea" style="width: 300px"></el-input>
         </el-form-item>
         <el-form-item label="优惠后">
-          {{ selectListRow.totalAmount - (discountForm.discountTotal || 0) }}
+          {{ (selectListRow.totalAmount - (discountForm.discountTotal || 0)).toFixed(2)}}
           <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="selectListRow.currencyId" />
         </el-form-item>
         <el-form-item v-if="opnotice" label="操作人">

src/views/ecw/financial/creatPayment.vue

@@ -554,15 +554,14 @@ export default {
               const params = {...this.form}
               if (this.list && this.list.length > 0) {
                 params.payableReqVOList = [...this.list]
+              }else{
+                this.$modal.msgError("请选择供应商未付款项");
+                return
               }
               if(!params.supplierBankAccount){
                 this.$modal.msgError("请选择供应商银行账号");
                 return
               }
-              if (params.payableReqVOList.length === 0) {
-                this.$modal.msgError("请选择供应商未付款项");
-                return
-              }
               if (this.id && this.id !== '0') {
                 updatePayment(params).then(res => {
                   this.$modal.msgSuccess("修改成功");
@@ -585,14 +584,24 @@ export default {
           const params = {...this.form}
           if (this.list && this.list.length > 0) {
             params.payableReqVOList = [...this.list]
+          }else{
+            this.$modal.msgError("请选择供应商未付款项");
+            return
           }
           if(!params.supplierBankAccount){
             this.$modal.msgError("请选择供应商银行账号");
             return
           }
-          if (params.payableReqVOList.length === 0) {
-            this.$modal.msgError("请选择供应商未付款项");
-            return
+          if (this.id && this.id !== '0') {
+            updatePayment(params).then(res => {
+              this.$modal.msgSuccess("修改成功");
+              this.$router.back();
+            })
+          } else {
+            createPayment(params).then(res => {
+              this.$modal.msgSuccess("新增成功");
+              this.$router.back();
+            })
           }
           // console.log(params, '-----params---------')
         }