漏组批次订单-确认组批次完成

src/api/emis/emisTmsSiteBatchMiss.js

@@ -42,3 +42,12 @@ export function delEmisTmsSiteBatchMiss(id) {
     method: 'delete'
   })
 }
+
+// 确认组批次完成
+export function confirmBatch(data) {
+  return request({
+    url: '/emis/emisTmsSiteBatchMiss/confirmBatch',
+    method: 'post',
+    data: data
+  })
+}

src/views/emis/emisTmsSiteBatchMiss/confirmForm.vue

@@ -0,0 +1,97 @@
+<template>
+    <div>
+        <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
+            <el-form-item label="类型">
+                <el-radio-group v-model="form.blManual" @change="handleChange">
+                    <el-radio label="3">无需组批次</el-radio>
+                    <el-radio label="2">组批次已经完成</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="修改原因" prop="manualRemark">
+                <el-input v-model="form.manualRemark" placeholder="" type="textarea" />
+            </el-form-item>
+        </el-form>
+        <div style="text-align: center;margin-bottom: 10px;">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+        </div>
+    </div>
+</template>
+<script>
+import { confirmBatch } from "@/api/emis/emisTmsSiteBatchMiss";
+
+export default {
+props:{
+    billCodeList:{
+     type:Array,
+     default:()=>[]
+    }
+},
+data() {
+
+return {
+form:{
+    blManual:'3',
+    manualRemark:'',
+},
+queryParams: {
+    pageNum: 1,
+    pageSize: 20,
+   
+},
+rules: {
+    manualRemark: [
+      { required: true, message: '请输入修改原因', trigger: 'blur' }
+    ]
+  }
+}
+},
+methods: {
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {    
+            let formData = {...this.form}
+            formData.params={
+                billCodeList:this.billCodeList
+            }
+          confirmBatch(formData).then(res => {
+            if (res.code == 200) {
+              this.$message({
+                message: "操作成功",
+                type: "success"
+              });
+              this.$emit("on-cancel");
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              });
+            }
+          });
+        } else {
+        //  console.log('校验失败')
+          }
+      });
+    },
+    cancel() {
+      this.$refs["form"].resetFields();
+      this.$emit("on-cancel");
+    },
+    handleChange(val) {
+      if (val == '3') {
+          this.$set(this.rules, 'manualRemark',[{ required: true, message: '请输入修改原因', trigger: 'blur' }])
+      }else{
+        this.$set(this.rules, 'manualRemark',[])
+        //清除校验
+        this.$refs.form.clearValidate('manualRemark');
+      }
+    },
+
+  }
+}
+
+
+</script>
+<style lang="scss" scoped>
+
+</style>

src/views/emis/emisTmsSiteBatchMiss/index.vue

@@ -42,6 +42,7 @@
 
       <el-form-item label="漏组次数" prop="missCount">
         <el-select clearable v-model="queryParams.missCount" placeholder="请选择">
+          <el-option label="人工修改运单" :value="-7"></el-option>
           <el-option label="运单分批后未组完" :value="-6"></el-option>
           <el-option label="其他" :value="-5"></el-option>
           <el-option label="组批次完成" :value="-4"></el-option>
@@ -126,6 +127,15 @@
                   v-hasPermi="['emis:emisTmsSiteBatchMiss:export']"
                 >导出</el-button>
               </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleConfirm"
+                  :disabled="confirmDisabled"
+                >确认组批次完成</el-button>
+              </el-col>
           </el-row>
       </div>
 
@@ -177,8 +187,26 @@
       <!-- <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" /> -->
       <el-table-column :label="$t('录单备注')" align="center" prop="waybillRemark" min-width="200" :show-overflow-tooltip="true"/>
       <!-- <el-table-column :label="$t('创建人')" align="center" prop="createByName" min-width="100" /> -->
+      <el-table-column :label="$t('修改原因')" align="center" prop="manualRemark" min-width="100" >
+      </el-table-column>
+      <el-table-column :label="$t('完成状态')" align="center" prop="blManual" min-width="100" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.blManual==1">系统审核完成</span>
+          <span v-if="scope.row.blManual==2">人工审核完成</span>
+          <span v-if="scope.row.blManual==3">无需组批次</span>
+        </template>
+      </el-table-column>
+
 
     </XdTable>
+    <!-- 确认组批次完成 弹窗 -->
+    <el-dialog
+      title="确认组批次完成"
+      :visible.sync="openConfirmForm"
+      width="30%"
+    >
+    <confirmForm ref="confirmForm"  @on-cancel="handleCancel" :billCodeList="billCodeList"/>
+    </el-dialog>
 
   </XdPageContainer>
 </template>
@@ -204,7 +232,7 @@ import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 import {timeFormat} from '@/utils/dateUtils'
-
+import confirmForm from "@/views/emis/emisTmsSiteBatchMiss/confirmForm.vue";
 
 export default {
   name: "EmisTmsSiteBatchMiss",
@@ -217,7 +245,8 @@ export default {
     TransLinePicker,
     TransProductPicker,
     EmpNamePicker1,
-    EmpNamePicker2
+    EmpNamePicker2,
+    confirmForm
    },
   dicts: ['emis_payment_type'],
   data() {
@@ -230,6 +259,7 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
+      confirmDisabled:true,
       // 显示搜索条件
       showSearch: true,
       // 创建时间搜索
@@ -243,6 +273,7 @@ export default {
 
       currentId:null,
       openForm: false,
+      openConfirmForm: false,
       titleForm: "",
 
       // 弹出展示层
@@ -268,6 +299,7 @@ export default {
         missCount:null,
         sendSiteCode:null
       },
+      billCodeList:[] // 选中的单号
     };
   },
   created() {
@@ -327,6 +359,7 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
       this.selectList = selection
+      this.confirmDisabled = selection.length ===0;
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
     handleSortChange(column) {
@@ -482,6 +515,17 @@ export default {
         if (j === 'paymentType') {
           return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
         }
+        if(j === 'blManual'){
+          if(v[j] == 1){
+            return '系统审核完成';
+          }
+          else if(v[j] == 2){
+            return '人工审核完成';
+          }
+          else if(v[j] == 3){
+            return '无需组批次';
+          }
+        }
         return v[j]
       }))
     },
@@ -494,6 +538,19 @@ export default {
     dateTimeChange(value){
         this.dateTimeRange=value;
     },
+    //确认组批次完成
+    handleConfirm(){
+      //有选中值
+      this.openConfirmForm= true;
+      //获取选择数据的 运单号
+      this.billCodeList=[];
+      this.selectList.forEach(item=>{
+        this.billCodeList.push(item.billCode);
+      })
+    },
+    handleCancel(){
+      this.openConfirmForm= false;
+    }
   }
 };
 </script>