几个bug

src/views/bpm/task/copy.vue

@@ -11,8 +11,8 @@
                      :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 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"
@@ -32,7 +32,7 @@
           <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="processName"/>
       <el-table-column label="流程发起人" align="center" prop="originatorName"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">

src/views/bpm/task/done.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="$t('流程名')" prop="name">
-        <el-input v-model="queryParams.name" :placeholder="$t('请输入流程名')" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item :label="$t('任务名称')" prop="name">
+        <el-input v-model="queryParams.name" :placeholder="$t('请输入任务名称')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('创建时间')">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"

src/views/ecw/order/edit.vue

@@ -261,37 +261,37 @@
                     <el-input v-model="form.marks" ></el-input>
                 </el-form-item>
                 <el-form-item label="是否控货" prop="isCargoControl" class="ml-20">
-                    <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCargoControl" form-type="radio"  :disabled="inWarehouse"/>
+                    <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCargoControl" form-type="radio"/>
                 </el-form-item>
             </div>
             <div class="form-section" v-if="collectionProxy">
                 <el-form-item :label="$t('是否代收货款')" prop="isCollection">
-                    <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCollection" form-type="radio" :disabled="inWarehouse" />
+                    <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCollection" form-type="radio" :disabled="false" />
                 </el-form-item>
                 <!--代收货款，只有非控货订单、并且线路开通了代收货款后，才显示是否代收货款选项-->
                 <el-form-item :label="$t('代收货款金额')" v-if="collectionProxy && form.isCollection" prop="collectionProxy" class="ml-20">
-                    <el-input v-model="form.collectionProxy" class="w-200 mr-10"  :disabled="inWarehouse"></el-input>
-                    <selector v-model="form.collectionProxyCurrency" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100"  :disabled="inWarehouse"/>
+                    <el-input v-model="form.collectionProxy" class="w-200 mr-10"  :disabled="false"></el-input>
+                    <selector v-model="form.collectionProxyCurrency" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100"  :disabled="false"/>
                 </el-form-item>
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('单证报关')" :span="2" prop="customsType">
-                    <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable :disabled="inWarehouse" />
+                    <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable :disabled="false" />
                 </el-form-item>
             </div>
             <div>
                 <el-form-item :label="$t('出单方式')" prop="issuingMethod">
-                    <dict-selector :type="DICT_TYPE.ECW_SUING_METHOD" v-model="form.issuingMethod" form-type="radio" defaultable  :disabled="inWarehouse"/>
+                    <dict-selector :type="DICT_TYPE.ECW_SUING_METHOD" v-model="form.issuingMethod" form-type="radio" defaultable  :disabled="false"/>
                 </el-form-item>
             </div>
             <div>
                 <el-form-item :label="$t('入仓类型')" prop="warehouseType">
-                    <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="form.warehouseType" defaultable  :disabled="inWarehouse" />
+                    <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="form.warehouseType" defaultable  :disabled="false" />
                 </el-form-item>
             </div>
             <div>
                 <el-form-item :label="$t('外部仓库')" prop="warehouseType">
-                    <el-checkbox label="" :checked="!!form.isExternalWarehouse" @change="form.isExternalWarehouse=$event" :disabled="inWarehouse"></el-checkbox>
+                    <el-checkbox label="" :checked="!!form.isExternalWarehouse" @change="form.isExternalWarehouse=$event" :disabled="false"></el-checkbox>
                 </el-form-item>
                 <div v-if="form.isExternalWarehouse" class="pl-50">
                     <div v-for="(item, index) in form.externalWarehouseDtoList" class="flex" :key="index">
@@ -327,7 +327,7 @@
             </div>
             <div>
                 <el-form-item :label="$t('收货方式')" prop="harvestMethod" class="ml-20">
-                    <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.harvestMethod" :filter="item => item.value == 1 || homeDeliveryService" defaultable :disabled="inWarehouse" />
+                    <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.harvestMethod" :filter="item => item.value == 1 || homeDeliveryService" defaultable :disabled="false" />
                 </el-form-item>
             </div>
             <div v-if="homeDeliveryService && form.harvestMethod == 2">
@@ -339,21 +339,21 @@
                     @countryChange="onAreaChange('country', $event)"
                     @provinceChange="onAreaChange('province', $event)"
                     @cityChange="onAreaChange('city', $event)"
-                    :disabled="inWarehouse"
+                    :disabled="false"
                     ></area-selector>
                 </el-form-item>
                 <el-form-item :label="$t('收货详细地址')" prop="consigneeAddress">
-                    <el-input v-model="form.consigneeAddress"  :disabled="inWarehouse"></el-input>
+                    <el-input v-model="form.consigneeAddress"  :disabled="false"></el-input>
                 </el-form-item>
             </div>
             <div>
                 <el-form-item :label="$t('付款人')" prop="drawee">
-                     <dict-selector :type="DICT_TYPE.DRAWEE" v-model="form.drawee" defaultable form-type="radio"  :disabled="inWarehouse"/>
+                     <dict-selector :type="DICT_TYPE.DRAWEE" v-model="form.drawee" defaultable form-type="radio"  :disabled="false"/>
                      <el-table :data="customDraweeList" v-if="form.drawee==3" >
                        <el-table-column label="费用类型" prop="label" width="200px"></el-table-column>
                        <el-table-column label="付款人" width="300px">
                             <template slot-scope="{row}">
-                                <dict-selector :type="DICT_TYPE.DRAWEE" :filter="(e) => e.value == '1' || e.value == '2'" v-model="row.value" form-type="radio"  :disabled="inWarehouse"/>
+                                <dict-selector :type="DICT_TYPE.DRAWEE" :filter="(e) => e.value == '1' || e.value == '2'" v-model="row.value" form-type="radio"  :disabled="false"/>
                             </template>
                        </el-table-column>
                      </el-table>
@@ -364,57 +364,57 @@
         <el-card  class="mt-10" v-if="transport">
             <div class="card-title" slot="header">{{transport.label}}</div>
             <el-form-item :label="$t('快递单号')">
-                <el-input v-model="form.number" :placeholder="$t('请输入购买商品的快递单号')" :disabled="inWarehouse">
-                    <el-button type="primary" slot="append" @click="getOrderCourierNumber" :disabled="inWarehouse">{{$t('生成单号')}}</el-button>
+                <el-input v-model="form.number" :placeholder="$t('请输入购买商品的快递单号')" :disabled="false">
+                    <el-button type="primary" slot="append" @click="getOrderCourierNumber" :disabled="false">{{$t('生成单号')}}</el-button>
                 </el-input>
             </el-form-item>
 
             <div v-if="[2,3,4].indexOf(+form.transportId) > -1">
                 <el-form-item :label="$t('是否双清')">
-                    <dict-selector v-model="form.doubleClear" form-type="radio" :type="DICT_TYPE.ECW_DOUBLE_CLEAR" defaultable :disabled="inWarehouse" />
+                    <dict-selector v-model="form.doubleClear" form-type="radio" :type="DICT_TYPE.ECW_DOUBLE_CLEAR" defaultable :disabled="false" />
                 </el-form-item>
             </div>
 
             <div v-if="[3,4].indexOf(+form.transportId) > -1">
                 <el-form-item :label="$t('航空公司')">
-                    <supplier-selector v-model="form.airlineCompany" company-type="10"  :disabled="inWarehouse"/>
+                    <supplier-selector v-model="form.airlineCompany" company-type="10"  :disabled="false"/>
                 </el-form-item>
             </div>
             <div  v-if="[2].indexOf(+form.transportId) > -1">
                 <el-form-item :label="$t('船公司')">
-                    <supplier-selector v-model="form.shippingCompany" company-type="9" :disabled="inWarehouse" />
+                    <supplier-selector v-model="form.shippingCompany" company-type="9" :disabled="false" />
                 </el-form-item>
             </div>
             <div v-if="[2,3,4].indexOf(+form.transportId) > -1">
                 <el-form-item :label="$t('清关证书')">
-                    <dict-selector v-model="form.customsClearCert"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="inWarehouse" />
+                    <dict-selector v-model="form.customsClearCert"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" />
                 </el-form-item>
                 <el-form-item label="清关证书备注" >
-                    <el-input v-model="form.remarks"  :disabled="inWarehouse"></el-input>
+                    <el-input v-model="form.remarks"  :disabled="false"></el-input>
                 </el-form-item>
             </div>
             <div v-if="[3,4].indexOf(+form.transportId) > -1">
                 <el-form-item label="是否拆包">
-                    <dict-selector v-model="form.isUnpack"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="inWarehouse" />
+                    <dict-selector v-model="form.isUnpack"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" />
                 </el-form-item>
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('单票立刻转运')" v-if="[3,4].indexOf(+form.transportId) > -1">
-                    <dict-selector v-model="form.isSingleTicketTransport"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="inWarehouse" />
+                    <dict-selector v-model="form.isSingleTicketTransport"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" />
                     <span style="margin-left:10px">{{$t('注：若只有一件，货到仓库立即发，选“是”，多件需仓库集运待发，选“否”')}}</span>
                 </el-form-item>
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('特殊要求')" >
-                    <dict-selector v-model="form.packageTypeArr" form-type="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" multiple  :disabled="inWarehouse"/>
+                    <dict-selector v-model="form.packageTypeArr" form-type="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" multiple  :disabled="false"/>
                 </el-form-item>
             </div>
             <el-form-item :label="$t('特殊要求备注')">
-                <el-input v-model="form.packageRemarks"  :disabled="inWarehouse" ></el-input>
+                <el-input v-model="form.packageRemarks"  :disabled="false" ></el-input>
             </el-form-item>
         </el-card>
 
-        <el-card  class="mt-10" v-if="inWarehouse">
+        <el-card  class="mt-10" v-if="showWorkFlow">
             <div class="card-title" slot="header">{{$t('审批流程')}}</div>
             <work-flow xmlkey="order_modify" v-model="ccIdArr" />
         </el-card>
@@ -561,9 +561,15 @@ export default {
         objectiveId         : [{required: true, message: this.$t('请选择目的城市')}],
         lineId              : [{required: true, message: this.$t('请选择路线')}],
         channelId           : [{required: true, message: this.$t('请选择出货渠道')}],
-        deliveryDate        : [{required: true, message: this.$t('请选择送货日期')}],
+        deliveryDate        : [{required: true, message: this.$t('请选择预计送货日期')}],
         consigneeAddress    : [{required: true, message: this.$t('请填写详细地址')}],
-        country             : [{required: true, message: this.$t('收货地区填写不完整')}]
+        country             : [{required: true, message: this.$t('收货地区填写不完整')}],
+        isCargoControl      : [{required: true, message: this.$t('请选择是否控货')}],
+        isCollection        : [{required: true, message: this.$t('请选择代收货款')}],
+        collectionProxy     : [{required: true, message: this.$t('代收货款不能为空')}],
+        customsType         : [{required: true, message: this.$t('请选择单证报关')}],
+        warehouseType       : [{required: true, message: this.$t('请选择入仓类型')}],
+        harvestMethod       : [{required: true, message: this.$t('请选择收货方式')}]
       },
       labelStyle: 'width:120px',
       showBatchImportDialog: false, // 显示批量导入弹窗
@@ -571,6 +577,7 @@ export default {
       exportLoading: false, // 装下单模板下载状态
       contactChooseType: null, // 联系人选择对象consignor(发货人) 或者 consignee（收货人）
       quickCreateType: null, // 快速新建客户类型，1发货人，2收货人
+      showWorkFlow: false, // 是否显示工作流表单
     };
   },
   computed:{
@@ -794,6 +801,23 @@ export default {
             if(res.data.ccIds){
                 this.ccIdArr = res.data.ccIds.split(",").filter(item => item && item != '')
             }
+
+            // 审核中需要显示流程表单
+            if(this.form.applyStaus == 1){
+                this.showWorkFlow = true
+            }
+
+            // 如果已完成入仓，则需要监听必填内容，发生更改后需要填写审批表单
+            this.$nextTick(res => {
+                if(this.inWarehouse){
+                    Object.keys(this.rules).forEach(field => {
+                        console.log("watch", field)
+                        this.$watch(`form.${field}`, () => {
+                            this.showWorkFlow = true
+                        })
+                    })
+                }
+            })
         })
     },
     onContactChoose(contact){