bug323 后台集运包裹列表排版和字段没有按需求开发

src/views/ecw/cons/addForOrder.vue

@@ -97,6 +97,10 @@
         </template>
       </el-table-column>
     </el-table>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="confirm">{{ $t("追加") }}</el-button>
+      <el-button  @click="cancel">{{ $t("取消") }}</el-button>
+    </div>
   </el-dialog>
 </template>
 
@@ -187,6 +191,16 @@ export default {
   watch:{
   },
   methods: {
+    confirm() {
+      if (!this.order){
+        this.$message.error(this.$t("请选择订单"))
+      }
+      this.$emit('select-order',this.order)
+      this.$emit('update:showAddForOrder',false)
+    },
+    cancel(){
+      this.$emit('update:showAddForOrder',false)
+    },
     getCurrentRow(row){
       // 获取选中数据   row表示选中这一行的数据，可以从里面提取所需要的值
       this.order = row

src/views/ecw/cons/index.vue

@@ -69,6 +69,43 @@
       <el-form-item :label="$t('验货状态')" prop="inspectStatus" v-show="showSearch">
         <dict-selector v-model="queryParams.inspectStatus" :type="DICT_TYPE.CONS_INSPECT_STATUS" fomatter="bool" clearable @change="handleQuery" class="w-200" />
       </el-form-item>
+      <el-form-item :label="$t('退仓处理状态') + ':'">
+        <el-select
+          v-model="queryParams.returnStatus"
+          clearable
+        :placeholder="$t('请选择状态')"
+        >
+        <el-option
+          :label="$t('未处理')"
+          :value="0"
+        />
+        <el-option
+          :label="$t('已处理')"
+          :value="1"
+        />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('订单状态')">
+        <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.orderStatus" :filter="statusDictFilter" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('商品')" prop="prodKey" v-show="showSearch">
+        <el-input
+          v-model.trim="queryParams.prodKey"
+          :placeholder="$t('请输入商品类型、品名或品牌')"
+          clearable
+          @keyup.enter.native="handleQuery"
+          class="w-200"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('创建时间')" v-show="showSearch">
+        <el-date-picker v-model="dateRangeCreateTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd" @change="handleQuery"> </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="$t('验货时间')" v-show="showSearch">
+        <el-date-picker v-model="dateRangeInTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd" @change="handleQuery"> </el-date-picker>
+      </el-form-item>
+      <el-form-item :label="$t('转运时间')" v-show="showSearch">
+        <el-date-picker v-model="dateRangeTransformTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd" @change="handleQuery"> </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -270,10 +307,7 @@
       </el-table-column>
       <el-table-column :label="$t('验货')" align="center">
         <template slot-scope="scope">
-          <template v-if="scope.row.inspectStatus===null">
-            {{ $t('未申请') }}
-          </template>
-          <template v-else>
+          <template>
             <dict-tag :type="DICT_TYPE.CONS_INSPECT_STATUS" :value="scope.row.inspectStatus"/>
           </template>
         </template>
@@ -300,11 +334,6 @@
       </el-table-column>
       <el-table-column label="包裹号" align="center" prop="consNum"/>
       <el-table-column label="包裹备注" align="center" prop="remarks"/>
-      <el-table-column label="" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-dropdown>
@@ -429,13 +458,18 @@
             </template>
           </el-form-item>
           <el-form-item label="订单编号:">
-            <el-input style="width: 70%;margin-right: 5px" v-model="addForm.orderId"></el-input><el-button type="primary"  @click.native="showAddForOrder = true">添加</el-button>
+            <el-input style="width: 70%;margin-right: 5px" v-model="addForm.order.orderNo"></el-input><el-button type="primary"  @click.native="showAddForOrder = true">添加</el-button>
           </el-form-item>
         <el-form-item label="订单状态:">
           <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="addForm.orderStatus"/>
+            <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="addForm.order.status"/>
           </template>
         </el-form-item>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" v-if="addForm.order.status < 11" @click="addConfirm(0)">{{ $t("确认") }}</el-button>
+          <el-button type="primary" v-else @click="addConfirm(1)">{{ $t("提交申请") }}</el-button>
+          <el-button  @click="openAdd = false">{{ $t("取消") }}</el-button>
+        </div>
       </el-form>
     </el-dialog>
     <!-- 对话框(添加 / 修改) -->
@@ -526,16 +560,18 @@
                           :consId="id"></SpecialNeedsConsLook>
     <fee-application-cons v-if="feeApplicationBol" :consId="id" :currencys="JSON.stringify(currencyList)"
                           :dialog-visible.sync="feeApplicationBol " @refresh="getList"></fee-application-cons>
+    <batch-fee-application-cons v-if="feeApplicationBol" :consId="id" :currencys="JSON.stringify(currencyList)"
+                          :dialog-visible.sync="feeApplicationBol " @refresh="getList"></batch-fee-application-cons>
     <ConsFollowupEdit :showConsFollowupEdit.sync="showConsFollowupEdit" :consId="id"
                       @determine="getList"></ConsFollowupEdit>
     <batch-sign-off :showConsBatchSignOff.sync="showConsBatchSignOff" @determine="getList"
                     :consIds="consIds"></batch-sign-off>
-    <batch-cons-edit :showConsBatchEdit.sync="showConsBatchEdit" @determine="getList"
+    <batch-cons-edit v-if="showConsBatchEdit" :showConsBatchEdit.sync="showConsBatchEdit" @determine="getList"
                      :consIds="consIds"></batch-cons-edit>
     <cons-withdrawal v-if="show" :dialog-visible="show"  :consId="consId"></cons-withdrawal>
     <cons-withdrawal-exit v-if="showExit" :dialog-visible="showExit"  :consId="consId"></cons-withdrawal-exit>
     <cons-withdrawal-deal v-if="showReturnWarehouse" :dialog-visible="showReturnWarehouse"  :consId="consId" ></cons-withdrawal-deal>
-    <add-for-order v-if="showAddForOrder" :showAddForOrder.sync="showAddForOrder" :consId="addForm.consId" @determine="getList"></add-for-order>
+    <add-for-order v-if="showAddForOrder" @select-order="selectOrder" :showAddForOrder.sync="showAddForOrder" :consId="addForm.consId" @determine="getList"></add-for-order>
   </div>
 </template>
 
@@ -552,6 +588,7 @@ import SpecialNeedsConsLook from "@/views/ecw/cons/components/SpecialNeedsConsLo
 
 import {getCurrencyList} from "@/api/ecw/currency"
 import FeeApplicationCons from "@/views/ecw/cons/components/FeeApplicationCons.vue"
+import BatchFeeApplicationCons from "@/views/ecw/cons/components/BatchFeeApplicationCons.vue"
 import {getChannelList} from "@/api/ecw/channel";
 import ConsFollowupEdit from "@/views/ecw/consFollowup/components/ConsFollowupEdit.vue"
 import BatchSignOff from "@/views/ecw/cons/batchSignOff.vue";
@@ -578,6 +615,7 @@ export default {
     Transmutation,
     Template,
     FeeApplicationCons,
+    BatchFeeApplicationCons,
     SpecialNeedsConsLook,
     ConsFollowupEdit,
     SpecialNeedsCons,
@@ -632,6 +670,8 @@ export default {
       dateRangeWatTime: [],
       dateRangeSignedTime: [],
       dateRangeCreateTime: [],
+      dateRangeInTime: [],
+      dateRangeTransformTime: [],
       // 查询参数
       queryParams: {
         page: 1,
@@ -653,6 +693,9 @@ export default {
         sumQuantity: null,
         opSource: null,
         remarks: null,
+        returnStatus: null,
+        prodKey: null,
+        orderStatus: null
       },
       // 表单参数
       form: {
@@ -661,8 +704,7 @@ export default {
       // 追加表单参数
       addForm: {
         consId: null,
-        orderId: null,
-        orderStatus: null,
+        order:{}
       },
       // 表单校验
       rules: {
@@ -708,7 +750,6 @@ export default {
       return this.$i18n.locale === "zh_CN";
     },
     combinedQueryParams() {
-      console.log(this.queryParams)
       let queryParams = {...this.queryParams}
       if (this.noParam.value) {
         queryParams[this.noParam.key] = this.noParam.value
@@ -727,6 +768,22 @@ export default {
     },
   },
   methods: {
+    // 过滤订单状态筛选字典内容
+    statusDictFilter(item) {
+      if (item.cssClass && item.cssClass != "air") {
+        return false
+      }
+      return true
+    },
+    addConfirm(val){
+      //如果是未入仓，直接追加
+      if (val===0){
+
+      }else{
+        //需要审批
+
+      }
+    },
     handleInspectSubmit(){
       const param= {};
       param.inspectStatus=1
@@ -866,6 +923,8 @@ export default {
       this.addBeginAndEndTime(params, this.dateRangeWatTime, 'watTime');
       this.addBeginAndEndTime(params, this.dateRangeSignedTime, 'signedTime');
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      this.addBeginAndEndTime(params, this.dateRangeInTime, 'inspectionTime');
+      this.addBeginAndEndTime(params, this.dateRangeTransformTime, 'transformTime');
       // 执行查询
       getConsPage(params).then(response => {
         this.list = response.data.list;
@@ -1165,6 +1224,11 @@ export default {
       this.$router.push({
         path: "./consException?id=" + row.id
       })
+    },
+    //选择订单给追加订单dialog复制
+    selectOrder(order) {
+      console.log("this.order",order)
+      this.$set(this.addForm, "order", order)
     }
   }
 };