发货单新增提交、撤回功能

src/HDrpManagement/dispatch/details/index.vue

@@ -16,10 +16,12 @@
       </div>
       <div slot="customOperation">
         <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.STATUS == '新建'" :data="mainData" @onSuccess="onSuccess" />
-        <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'createBill')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">{{$t(`生成物流单`)}}</el-button>
-        <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck">{{mainData.STATUS === '审核'?$t('反审'):mainData.STATUS === '复核'?$t('反审'):$t('审核')}}</el-button>
-        <el-button  class="inline-16" type="primary" size="mini" v-if="tool.checkAuth($route.name,'recheck')" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck">{{mainData.STATUS === '复核'?$t('反复核'):$t('复核')}}</el-button>
-        <el-button type="primary" size="mini" @click="onDel" style="margin-left: 0px" class="inline-16" :disabled="mainData.STATUS === '审核' || mainData.STATUS === '复核'">{{$t('删 除')}}</el-button>
+        <el-button class="inline-16" :type="mainData.STATUS !== '复核'?'':'primary'" size="mini"  v-if="tool.checkAuth($route.name,'createBill') && (mainData.STATUS == '新建' || mainData.STATUS == '提交' || mainData.STATUS == '复核')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">{{$t(`生成物流单`)}}</el-button>
+        <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.STATUS == '新建'" btnTitle="提交" :disabled="mainData.STATUS !== '新建'" btnType="primary" content="是否确定提交发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
+        <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'revocation') && mainData.STATUS == '提交'" btnTitle="撤回" :disabled="mainData.STATUS !== '提交'" btnType="primary" content="是否确定撤回发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915580002" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
+        <el-button :type="mainData.STATUS !== '审核' && mainData.STATUS !== '提交'?'':'primary'" class="inline-16" size="mini"  v-if="tool.checkAuth($route.name,'check') && mainData.STATUS !== '复核' && mainData.STATUS !== '关闭'" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '提交'" @click="onCheck">{{mainData.STATUS === '审核'?$t('反审核'):mainData.STATUS === '复核'?$t('反审核'):$t('审核')}}</el-button>
+        <el-button style="margin-left: 0px"  class="inline-16" :type="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'?'':'primary'" size="mini" v-if="tool.checkAuth($route.name,'recheck') && mainData.STATUS !== '关闭'" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck">{{mainData.STATUS === '复核'?$t('反复核'):$t('复核')}}</el-button>
+        <el-button :type="mainData.STATUS != '新建' && mainData.STATUS != '关闭'?'':'primary'" size="mini" @click="onDel" style="margin-left: 0px" class="inline-16" :disabled="mainData.STATUS != '新建' && mainData.STATUS != '关闭'">{{$t('删 除')}}</el-button>
       </div>
       <div slot="slot2" >
         <default-info :mainData="mainData"></default-info>
@@ -99,28 +101,9 @@ import defaultInfo from '../modules/defaultInfo.vue'
           },
           {
             label:'状态',
-            value:this.$t(this.mainData.status),
+            value:this.$t(this.mainData.STATUS),
             style:function () {
-              let style = {}
-              switch (that.mainData.STATUS) {
-                case '新建':
-                  style = {color:"#000000"}
-                  break;
-                case '提交':
-                  style = {color:"#d90a0a"}
-                  break;
-                case '审核':
-                  style = {color:"#52C41A"}
-                  break;
-                case '复核':
-                  style = {color:"#3874f6"}
-                  break;
-                case '关闭':
-                  style = {color:"#b2c0ea"}
-                  break;
-                default:
-                  break;
-              }
+              let style = that.tool.getStatusColor(that.mainData.STATUS)
               return style
             }
           },

src/HDrpManagement/dispatch/index.vue

@@ -17,6 +17,7 @@
             <label  class="search__label" >{{$t(`状态`)}}:</label>
             <el-select v-model="status" :placeholder="$t('请选择')" size="small" class="inline-16" @change="selectChange" clearable>
               <el-option :label="$t(`新建`)" value="新建"></el-option>
+              <el-option :label="$t(`提交`)" value="提交"></el-option>
               <el-option :label="$t(`审核`)" value="审核"></el-option>
               <el-option :label="$t(`复核`)" value="复核"></el-option>
               <el-option :label="$t(`关闭`)" value="关闭"></el-option>

src/template/buttonTemplate/confirmSelection.vue

@@ -14,6 +14,7 @@ export default {
     confirmButtonText:String,
     cancelButtonText:String,
     paramId:String,
+    idName:String,
     paramContent:Object,
     disabled:Boolean
   },
@@ -50,6 +51,11 @@ export default {
           sa_customersids: [this.$route.query.id],
           status: this.btnTitle == '暂缓'?"暂缓":'潜在'
         }
+      }else {
+        this.param.id = this.paramId
+        this.param.content = {
+          [this.idName]:this.$route.query.id
+        }
       }
       const res = await this.$api.requested(this.param)
       this.tool.showMessage(res,()=>{