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

src/views/bpm/task/done.vue

@@ -5,10 +5,24 @@
       <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-form-item :label="$t('流程编号')" prop="name">
+        <!--// TODO 缺少查询字段-->
+<!--        <el-input v-model="queryParams.no" :placeholder="$t('请输入流程编号')" clearable @keyup.enter.native="handleQuery"/>-->
+        缺少字段
+      </el-form-item>
+      <el-form-item :label="$t('流程分类')" prop="name">
+        <!--// TODO 缺少查询字段-->
+<!--        <el-input v-model="queryParams.no" :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"
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
+      <el-form-item :label="$t('业务编号')" prop="name">
+         缺少字段
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -18,30 +32,37 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column :label="$t('任务编号')" align="center" prop="id" width="320" fixed />
-      <el-table-column :label="$t('任务名称')" align="center" prop="name" width="200" />
-      <el-table-column :label="$t('所属流程')" align="center" prop="processInstance.name" width="200" />
+      <el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="200" />
+      <el-table-column :label="$t('业务编号')" align="center" prop="" width="200" >
+        缺少字段
+      </el-table-column>
+      <el-table-column :label="$t('流程分类')" align="center" prop="category" width="200" />
+      <el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200" />
+      <el-table-column :label="$t('状态')" align="center" prop="" width="200" >
+        缺少字段
+      </el-table-column>
       <el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120" />
       <el-table-column :label="$t('结果')" align="center" prop="result">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('审批意见')" align="center" prop="comment" width="200" />
-      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
+<!--      <el-table-column :label="$t('审批意见')" align="center" prop="comment" width="200" />-->
+      <el-table-column :label="$t('提交时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('审批时间')" align="center" prop="endTime" width="180">
+      <el-table-column :label="$t('结束时间')" align="center" prop="endTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('耗时')" align="center" prop="durationInMillis" width="180">
+<!--      <el-table-column :label="$t('耗时')" align="center" prop="durationInMillis" width="180">
         <template slot-scope="scope">
           <span>{{ getDateStar(scope.row.durationInMillis) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"

src/views/bpm/task/todo.vue

@@ -2,14 +2,12 @@
   <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>
-      <!-- // TODO 接口暂不支持
-      <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-form-item>
-      -->
       <el-form-item :label="$t('流程分类')" prop="category">
         <el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
@@ -21,16 +19,9 @@
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')"/>
       </el-form-item>
-      <!-- // TODO 接口暂不支持
-      <el-form-item label="状态" prop="name">
 
-      </el-form-item>
-      <el-form-item label="结果" prop="name">
-        
-      </el-form-item>
-      -->
-      <el-form-item :label="$t('业务编码')" prop="businessNo">
-        <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编码')" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item :label="$t('业务编号')" prop="businessNo">
+        <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
 
       <el-form-item>
@@ -41,25 +32,34 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('任务编号')" align="center" prop="id" width="320"/>
-      <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
+      <el-table-column :label="$t('编号')" align="center" prop="id" width="320"/>
+      <el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="320"/>
       <el-table-column :label="$t('流程分类')" 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="$t('所属流程')" align="center" prop="processInstance.name"/>
-      <el-table-column :label="$t('当前审批任务')" align="center" prop="name"/>
-      <el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname"/>
-      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
+      <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
+
+      <el-table-column :label="$t('当前审批节点')" align="center" prop="name"/>
+      <el-table-column :label="$t('状态')" align="center" prop="version" width="80">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.suspensionState === 1">{{$t('激活')}}</el-tag>
+          <el-tag type="warning" v-if="scope.row.suspensionState === 2">{{$t('挂起')}}</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('结果')" align="center" prop="processInstance.startUserNickname">
+          缺少字段
+      </el-table-column>
+      <el-table-column :label="$t('提交时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('状态')" align="center" prop="version" width="80">
+      <el-table-column :label="$t('结束时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.suspensionState === 1">{{$t('激活')}}</el-tag>
-          <el-tag type="warning" v-if="scope.row.suspensionState === 2">{{$t('挂起')}}</el-tag>
+          缺少字段
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">

src/views/ecw/coupon/edit.vue

@@ -351,6 +351,12 @@ export default {
         // 非优惠券则查询优惠券列表
         if(val && val != 1){
           this.getCouponSelect()
+
+          // 非优惠券给默认数据
+          this.$set(this.form, 'documentDeclaration', ["1"])
+          this.$set(this.form, 'isCargoControl', ["0"])
+          this.$set(this.form, 'orderAttr', ["2","3","1"])
+          this.$set(this.form, 'brand', ["0","1"])
         }
       },
       'form.isSimilarSuperposition'(val){
@@ -377,7 +383,6 @@ export default {
 							this.couponIds = couponIds.map(item => parseInt(item))
 						})
 					}
-					/* this.costType = this.form.costType */
 
 					if(this.form.discountDetailedVOs){
 						/* this[['clearanceFeeList', 'freightFeeList', 'discountList'][]] */

src/views/ecw/financial/receiptDetail.vue

@@ -260,22 +260,24 @@
           </template>
           {{ form.receivableTotalAmount }}
         </el-descriptions-item> -->
+
         <el-descriptions-item :label="$t('已核销总金额')">
-          <el-tag>{{ verificationData.usCount }}{{ $t('美元') }}</el-tag>
-          <el-tag>{{ verificationData.rmbCount }}{{ $t('人民币') }}</el-tag>
-          <el-tag>{{ verificationData.nairaCount }}{{ $t('奈拉') }}</el-tag>
+          <el-tag>{{ verificationData.usCount.toFixed(6) }}{{$t('美元')}}</el-tag>
+          <el-tag>{{ verificationData.rmbCount.toFixed(6) }}{{$t('人民币')}}</el-tag>
+          <el-tag>{{ verificationData.nairaCount.toFixed(6) }}{{$t('奈拉')}}</el-tag>
+
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
             {{ $t('已核销金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
           </template>
-          {{ verificationData.writtenOff }}
+          {{ verificationData.writtenOff.toFixed(6) }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
             {{ $t('已核销比例') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
           </template>
-          {{ verificationData.WriteOffProportion }}%
+          {{ parseFloat(verificationData.WriteOffProportion/100).toFixed(2) }}%
         </el-descriptions-item>
       </el-descriptions>
     </el-card>

src/views/ecw/financial/receivable.vue

@@ -162,15 +162,6 @@
               clearable
             />
           </el-form-item>
-          <el-form-item :label="$t('自编号')">
-            <el-input
-              style="max-width: 188px"
-              v-model="queryParams.selfNo"
-              :placeholder="$t('请输入自编号')"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
           <el-form-item :label="$t('创建时间')">
             <!-- <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTIME" v-model="queryParams.date"></dict-selector> -->
             <el-date-picker

src/views/ecw/order/edit.vue

@@ -290,7 +290,7 @@
                 </el-form-item>
             </div>
             <div>
-                <el-form-item :label="$t('外部仓库')" prop="warehouseType">
+                <el-form-item :label="$t('外部仓库')" prop="isExternalWarehouse">
                     <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">

src/views/ecw/productPrice/batchEdit.vue

@@ -154,6 +154,11 @@
         <!-- <el-form-item label="是否预付" prop="advanceStatus">
           <dict-selector form-type="radio" :type="DICT_TYPE.ADVANCE_STATUS" v-model="form.advanceStatus" />
         </el-form-item> -->
+        <el-form-item :label="$t('价格有效期')">
+          <el-date-picker v-model="form.validateStartDate" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+          -
+          <el-date-picker v-model="form.validateEndDate" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        </el-form-item>
       </el-card>
 
 
@@ -197,6 +202,7 @@ import ProductsSelector from '@/components/ProductsSelector'
 import { arrryToKeyedObjectBy } from '@/utils/index'
 import Selector from '@/components/Selector'
 import Inputor from '@/components/Inputor'
+import { parseTime } from '@/utils/ruoyi'
 
 export default {
   components: { RoutersSelector, ProductsSelector, Selector, Inputor },
@@ -319,6 +325,10 @@ export default {
         this.$set(this.form, 'productId', +this.$route.query.product_id)
       }
  */
+    // 默认今天起，两年有效
+    this.form.validateStartDate = parseTime(Date.now())
+    this.form.validateEndDate = parseTime(Date.now() + 86400*365*2*1000)
+
     // 默认费用单位
     this.setDefaultVolumeUnit(7)
 

src/views/ecw/productPrice/edit.vue

@@ -230,17 +230,9 @@ export default {
       priceStepList: [{},{}], // 阶梯价格
       // specialList:[], // 特殊需求,默认四个
       rules: {
-        /* typeId: [{ required: true, message: "产品类型不能为空", trigger: "blur" }],
-        titleZh: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
-        titleEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }], */
         transportPrice: [{ required: true, message: this.$t("海运费不能为空"), trigger: "blur" }],
         clearancePrice: [{ required: true, message: this.$t("清关费不能为空"), trigger: "blur" }],
-        advanceStatus: [{ required: true, message: this.$t("是否预付不能为空"), trigger: "blur" }],
-        //containerLocation: [{ required: true, message: "货柜位置不能为空", trigger: "blur" }],
-        //square: [{ required: true, message: "方数不能为空", trigger: "blur" }],
-        // zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
-        // paoLinjie:[{ required: true, message: "默认泡货标准不能为空", trigger: "blur" }],
-        // needBook: [{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
+        advanceStatus: [{ required: true, message: this.$t("是否预付不能为空"), trigger: "blur" }]
       },
       product: null,
       /* productType: null, */
@@ -375,6 +367,9 @@ export default {
       }
       getProductPriceList(query).then(res => {
         this.lineList = res.data
+        this.lineList.forEach(item =>{
+          this.checkList.push(item.id)
+        })
       })
     }
 

src/views/ecw/warehouse/index.vue

@@ -566,7 +566,7 @@ export default {
         for(let index in transportTypes) {
           let transportType = transportTypes[index];
           let name = this.transportName(transportType);
-          names.push(name);
+          if(name)names.push(name);
         }
         return names.join(',');
       }