Merge branch 'mergeBranch' into allTestUrgent

# Conflicts:
#	package-lock.json

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -363,7 +363,7 @@ export default {
   watch: {
     data: function (val) {
       if (val) {
-        this.listData();
+        // this.listData();
       }
     },
   },

src/HDrpManagement/contractManage/modules/detail.vue

@@ -408,7 +408,6 @@ export default {
       this.queryMainData(this.$route.query.id)
     },
     async queryMainData(id) {
-      // this.$refs.details.$refs.group.queryGroup()
       const res = await this.$api.requested({
         "id":20221121195102,
         "content": {
@@ -418,8 +417,6 @@ export default {
       })
       this.mainData = res.data
       console.log(this.$refs.details.param.content,'param')
-      // this.$refs.details.param.content.type = this.$route.query.tabIndex
-      // this.$refs.details.param.content.where.type = this.$route.query.type
       let listqueryid = sessionStorage.getItem('listqueryid')
       this.mainData.type == '项目'
         ? this.mainData.typemx == '直销'

src/HDrpManagement/dispatch/details/index.vue

@@ -19,7 +19,7 @@
         <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 style="margin-left: 0px"  :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" type="primary"  class="inline-16" size="mini"  v-if="tool.checkAuth($route.name,'check') && 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>

src/HDrpManagement/projectChange/index.vue

@@ -10,8 +10,8 @@
       :autoQuery="false"
       :specialKey="[{key:'leader',value:'name'},{key:'tag_sys',value:null}]"
       :detailPath="{path:'/projectChangeDetail',param:{tabIndex:tabIndex,portrait:''}}"
-      :exportValue="['结案原因','失败原因','操作']"
-      :exportName="['endreason','defeatreason','operation']"
+      :exportValue="['结案原因','失败类型','失败原因','操作']"
+      :exportName="['endreason','defeattype','defeatreason','operation']"
       :exporAdd="true"
       >
       <template #titleRight>