Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/dispatch/details/index.vue

@@ -22,9 +22,9 @@
         <Edit class="inline-16" style="margin-left: -10px" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="onSuccess" />
         <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>-->
-        <dialogTemplate ref="submitRef" v-if="tool.checkAuth($route.name,'submit') && mainData.status == '新建'" class="inline-16" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" :mainAData="mainAreaData" content="是否确定提交发货单" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess" @submitSuccess="submitSuccess"></dialogTemplate>
+        <dialogTemplate ref="submitRef" v-if="tool.checkAuth($route.name,'submit') && mainData.status == '新建' && usertype != 0" class="inline-16" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" :mainAData="mainAreaData" content="是否确定提交发货单" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess" @submitSuccess="submitSuccess"></dialogTemplate>
         <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="primary" v-if="tool.checkAuth($route.name,'verificationCheck') && (mainData.status == '新建')" size="mini" @click="onVerificationCheck"  class="inline-16" >{{$t('提交')}}</el-button>
+        <dialogTemplate ref="submitRefShow" v-if="tool.checkAuth($route.name,'verificationCheck') && (mainData.status == '新建')"  class="inline-16" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" :mainAData="mainAreaData" content="是否确定提交发货单" paramId="2024120915192102" idName="sa_dispatchid" :isParamId="false" @onSuccess="onSuccess" @submitSuccess="submitSuccess"></dialogTemplate>
         <el-button style="margin-left: 0px" type="primary"  class="inline-16" size="mini"  v-if="tool.checkAuth($route.name,'check') && mainData.status !== '审核' && mainData.status !== '复核' && mainData.status !== '关闭'"  @click="onCheck">{{mainData.status === '审核'?$t('反审核'):mainData.status === '复核'?$t('反审核'):$t('审核')}}</el-button>
         <dialogTemplateNew ref="dialogTemplateNew" class="inline-16" v-if="tool.checkAuth($route.name,'check') && mainData.status == '审核'" btnTitle="反审核" btnType="primary" content="确定反审核该发货单" @onCancel="form.uncheckreason = ''" @onSubmit="onSubmit">
           <template slot="formRule">
@@ -45,7 +45,6 @@
         <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 !== '关闭' && dispatch_recheck != 0" :disabled="mainData.status !== '审核' && mainData.status !== '复核'" @click="onReCheck">{{mainData.status === '复核'?$t('反复核'):$t('复核')}}</el-button>
         <el-button type="primary" v-if="(mainData.status == '审核' || mainData.status == '复核') && tool.checkAuth($route.name,'close')" size="mini" @click="onClose" style="margin-left: 0px" class="inline-16" >{{$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>
-        <dialogTemplate ref="submitRefShow" v-show="false" class="inline-16" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" :mainAData="mainAreaData" content="是否确定提交发货单" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess" @submitSuccess="submitSuccess"></dialogTemplate>
       </div>
       <div slot="slot2" >
         <default-info :mainData="mainData"></default-info>
@@ -87,7 +86,8 @@ import dialogTemplateNew from '@/components/dialogTemplate/index1'
             },
           ],
         },
-        detailPath:''
+        detailPath:'',
+        usertype:JSON.parse(sessionStorage.getItem('active_account')).usertype
       }
     },
     components:{

src/components/dialogTemplate/index.vue

@@ -22,11 +22,10 @@
 <script>
 export default {
   name: "index",
-  props:["btnTitle","mainAData","disabled","btnType","column","content","paramId","idName"],
+  props:["btnTitle","mainAData","disabled","btnType","column","content","paramId","idName",'isParamId'],
   data(){
     return {
       dialogTableVisible:false,
-      isParamId:true,
       param:{
         "id": 20221010164602,
         "content": {
@@ -42,7 +41,10 @@ export default {
       console.log(this.mainAData,'mainAData')
     },
     async onSubmit(){
-      if (this.isParamId){
+      console.log(this.isParamId,'版本更新')
+      if (this.isParamId == false){
+        this.$emit('submitSuccess')
+      }else {
         this.param.id = this.paramId
         this.param.content = {
           [this.idName]:this.$route.query.id
@@ -51,8 +53,6 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
         })
-      }else {
-        this.$emit('submitSuccess')
       }
     }
   }