Merge branch 'greenUrgent' into allTestUrgent

# Conflicts:
#	src/HDrpManagement/dispatch/details/index.vue

src/HDrpManagement/contractManage/components/addContract.vue

@@ -1187,6 +1187,13 @@ export default {
       }
       callback();
     };
+    var checkDays = (rule,value,callback) => {
+      let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+      if (isNaN(value) && (siteid == 'HY' || siteid == 'YOSTEST1')) {
+        return callback(new Error(this.$t("请填写数字")));
+      }
+      callback();
+    };
     var NumberSize = (rule, value, callback) => {
       if (isNaN(parseFloat(value)) && value !== "") {
         return callback(new Error(this.$t("输入不合法，请输入数值")));
@@ -1327,8 +1334,9 @@ export default {
           {
             required: true,
             message: this.$t("请设置发货日期提醒天数"),
-            trigger: "blur",
+            trigger: "change",
           },
+          {validator: checkDays,trigger: "change"}
         ],
         productdiscount: [
           /*  { message: '必须为数字', type:'number', trigger: 'change' },*/
@@ -1812,6 +1820,8 @@ export default {
     },
     /*获取付款条件*/
     async payTypeList() {
+      let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+      siteid == 'HY' || siteid == 'YOSTEST1'?this.form.reminddays = 7:this.form.reminddays = ''
       const res = await this.$api.requested({
         id: "20230110100103",
         content: {
@@ -1866,7 +1876,6 @@ export default {
       this.form.saler_hrid = res.data.leader ? res.data.leader[0].hr.hrid : "";
     },
   },
-
   mounted() {
     this.payTypeList();
   },

src/HDrpManagement/contractManage/components/editContract.vue

@@ -593,6 +593,13 @@ export default {
       }
       callback()
     }
+    var checkDays = (rule,value,callback) => {
+      let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+      if (isNaN(value) && (siteid == 'HY' || siteid == 'YOSTEST1')) {
+        return callback(new Error(this.$t("请填写数字")));
+      }
+      callback();
+    };
     var NumberSize = (rule, value, callback) => {
       if (isNaN(parseFloat(value)) && value !== ''){
         return callback(new Error(this.$t('输入不合法，请输入数值') ))
@@ -685,6 +692,7 @@ export default {
         ],
         reminddays: [
           { required: true, message: this.$t('请设置发货日期提醒天数'), trigger: 'blur' },
+          {validator: checkDays,trigger: "change"}
         ],
         enterprisename: [
           { required: true, message: this.$t('请选择'), trigger: 'change' },
@@ -793,6 +801,10 @@ export default {
       this.form.customername = this.data.ascription_enterprisename
       this.form.customerid = this.data.ascription_enterpriseid
       this.drawer = true
+      if (!this.form.reminddays){
+        let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+        siteid == 'HY' || siteid == 'YOSTEST1'?this.form.reminddays = 7:this.form.reminddays = ''
+      }
       this.$nextTick(() => {
         this.$refs.timeSelect.time = [this.form.begdate,this.form.enddate]
         this.payTypeList()

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 class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'createBill')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">{{$t(`生成物流单`)}}</el-button>
-        <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck" style="margin-left: 0">{{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" style="margin-left: 0">{{mainData.STATUS === '复核'?$t('反复核'):$t('复核')}}</el-button>
-        <el-button type="primary" size="mini" @click="onDel" class="inline-16" :disabled="mainData.STATUS === '审核' || mainData.STATUS === '复核'" style="margin-left: 0">{{$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>

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,
     statusData:String
@@ -51,6 +52,11 @@ export default {
           sa_customersids: [this.$route.query.id],
           status: this.statusData
         }
+      }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,()=>{