订单管理、订货业务、订货订单提交调整，bug修复

src/HDrpManagement/orderManage/details/index.vue

@@ -46,7 +46,7 @@
           </el-popover>
           <el-button v-if="tool.checkAuth($route.name,'examine') && mainData.status === '审核'"  type="primary" size="mini" @click="onReturnCheck">{{$t(`反审核`)}}</el-button>
           <el-button v-if="tool.checkAuth($route.name,'reback') && mainData.status === '提交'"  type="primary" size="mini" @click="dialogVisible = true">{{$t('退 回')}}</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'submit') && mainData.status === '新建' " :disabled="mainData.qty === 0"  type="primary" size="mini" @click="onSubmit('提交')">{{$t(`提 交`)}}</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'submit') && mainData.status === '新建' "  :disabled="mainData.qty === 0"  type="primary" size="mini" @click="onSubmit('提交')">{{$t(`提 交`)}}</el-button>
           <el-button v-if="tool.checkAuth($route.name,'finishOrder') && mainData.status === '审核'"  type="primary" size="mini" @click="closeOrder">{{$t(`结 案`)}}</el-button>
           <el-button v-if="tool.checkAuth($route.name,'insert')" class="inline-16"  type="primary" size="mini" @click="onCopy">{{$t(`复 制`)}}</el-button>
         </div>
@@ -172,7 +172,8 @@ export default {
       rebateamount:'',
       isusedrebate:'',
       checked:0,
-      typeNew:''
+      typeNew:'',
+      fullscreenLoading:false
     }
   },
   provide () {
@@ -486,7 +487,7 @@ export default {
         },
       })
       this.tool.showMessage(res,()=>{
-        this.queryMainData()
+        // this.queryMainData()
         this.dialogVisible = false
         this.$store.dispatch('changeDetailDrawer',false)
       })

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -478,6 +478,7 @@ export default {
         "id": 20221109093602,
         "content": val
       })
+      this.time = null
        if (res.code == 1) {
         this.$emit('onSuccess')
         // this.listData()

src/HManagement/clueManage/m_activity/modules/details.vue

@@ -18,7 +18,7 @@
       </div>
       <div slot="customOperation">
         <relase class="inline-16" v-if="tool.checkAuth($route.name,'relase') && mainData.status != '结束'" :data="mainData" @onSuccess="queryMainData"></relase>
-        <finish class="inline-16" v-if="tool.checkAuth($route.name,'finish')  && mainData.status != '结束'" :data="mainData" @onSuccess="queryMainData"></finish>
+        <finish class="inline-16" v-if="tool.checkAuth($route.name,'finish')  && mainData.status != '结束' && mainData.status != '新建'" :data="mainData" @onSuccess="queryMainData"></finish>
         <el-button size="mini" :disabled="mainData.ordercluecount > 0" class="inline-16" :type="mainData.ordercluecount === 0?'primary':''" @click="onDel" v-if="tool.checkAuth($route.name,'onDelete')  && mainData.status != '发布' && mainData.disabled">{{$t('删 除')}}</el-button>
       </div>
       <div slot="slot0" class="container normal-panel">

src/HManagement/roleManage/modules/roleContent copy.vue

@@ -3,11 +3,11 @@
     <div>
       <p class="normal-title mb-16">{{$t('角色信息')}}</p>
       <el-form :inline="true" :model="form" :rules="rules" ref="form" size="small" :label-width="tool.onlyZh('100px')" label-position="left" class="demo-form-inline">
-        <el-form-item :label="$t(`角色名称`)" prop="rolename">
+        <el-form-item :label="$t(`角色名称`)" prop="rolename" style="margin-right: 40px">
           <el-input v-model="form.rolename" :placeholder="$t(`输入角色名称`)"></el-input>
         </el-form-item>
-        <el-form-item :label="$t(`角色描述`)" prop="remarks">
-          <el-input v-model="form.remarks" :placeholder="$t(`输入角色描述`)"></el-input>
+        <el-form-item :label="$t(`角色描述`)" prop="remarks" style="margin-right: 40px">
+          <el-input v-model="form.remarks" :placeholder="$t(`输入角色描述`)" ></el-input>
         </el-form-item>
         <el-form-item :label="$t(`角色类型`)" prop="usertype">
           <el-select v-model="form.usertype" :placeholder="$t(`角色类型`)">

src/SDrpManagement/agentOrder/details/index.vue

@@ -292,6 +292,7 @@ export default {
       isusedrebate: "",
       checked: 0,
       rebateamount: "",
+      typeNew:''
     };
   },
   provide() {
@@ -313,27 +314,42 @@ export default {
   },
   methods: {
     async queryMainData(id) {
-      return new Promise(async (re, rj) => {
+      if (this.typeNew == '提交'){
         const res = await this.$api.requested({
-          id: "20221108151302",
+          id: type === "审核" ? 20221108153502 : 20221108153402,
           content: {
-            nocache: true,
-            sa_orderid: this.$route.query.id,
+            sa_orderid: this.mainData.sa_orderid,
+            sys_enterpriseid: this.mainData.sys_enterpriseid,
+            sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
           },
         });
-        this.mainData = res.data;
-        this.checked = this.mainData.rebate_used;
-        if (this.mainData.rebateamount > this.mainData.defaultamount) {
-          this.rebateamount = this.tool.formatAmount(
-            +this.mainData.defaultamount / 2
-          );
-        } else {
-          this.rebateamount = this.mainData.rebateamount;
-        }
-        this.changeDataStructure();
-        this.queryUsedrebate();
-        re();
-      });
+        this.tool.showMessage(res, async () => {
+          this.typeNew = ''
+          this.queryMainData();
+        });
+      }else {
+        return new Promise(async (re, rj) => {
+          const res = await this.$api.requested({
+            id: "20221108151302",
+            content: {
+              nocache: true,
+              sa_orderid: this.$route.query.id,
+            },
+          });
+          this.mainData = res.data;
+          this.checked = this.mainData.rebate_used;
+          if (this.mainData.rebateamount > this.mainData.defaultamount) {
+            this.rebateamount = this.tool.formatAmount(
+                +this.mainData.defaultamount / 2
+            );
+          } else {
+            this.rebateamount = this.mainData.rebateamount;
+          }
+          this.changeDataStructure();
+          this.queryUsedrebate();
+          re();
+        });
+      }
     },
     changeDataStructure() {
       let that = this;
@@ -459,17 +475,22 @@ export default {
         }
       )
         .then(async () => {
-          const res = await this.$api.requested({
-            id: type === "审核" ? 20221108153502 : 20221108153402,
-            content: {
-              sa_orderid: this.mainData.sa_orderid,
-              sys_enterpriseid: this.mainData.sys_enterpriseid,
-              sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
-            },
-          });
-          this.tool.showMessage(res, async () => {
-            this.queryMainData();
-          });
+          if (this.$refs.prod.time == null){
+            const res = await this.$api.requested({
+              id: type === "审核" ? 20221108153502 : 20221108153402,
+              content: {
+                sa_orderid: this.mainData.sa_orderid,
+                sys_enterpriseid: this.mainData.sys_enterpriseid,
+                sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
+              },
+            });
+            this.tool.showMessage(res, async () => {
+              this.queryMainData();
+            });
+          }else {
+            this.typeNew = type
+          }
+
         })
         .catch((err) => {
           this.$message({

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -387,6 +387,7 @@ export default {
         id: 20221109093602,
         content: val,
       });
+      this.time = null
       if (res.code == 1) {
         this.$emit("onSuccess");
       } else {

src/SDrpManagement/salerOrder/details/index.vue

@@ -298,6 +298,8 @@ export default {
       isusedrebate: "",
       checked: 0,
       rebateamount: "",
+      typeNew:'',
+      fullscreenLoading:false
     };
   },
   provide() {
@@ -320,28 +322,43 @@ export default {
   },
   methods: {
     async queryMainData(id) {
-      return new Promise(async (re, rj) => {
+      if (this.typeNew == '提交'){
         const res = await this.$api.requested({
-          id: "20221108151302",
+          id: type === "审核" ? 20221108153502 : 20221108153402,
           content: {
-            nocache: true,
-            sa_orderid: this.$route.query.id,
+            sa_orderid: this.mainData.sa_orderid,
+            sys_enterpriseid: this.mainData.sys_enterpriseid,
+            sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
           },
         });
-        this.mainData = res.data;
-        this.checked = this.mainData.rebate_used;
-        if (this.mainData.rebateamount > this.mainData.defaultamount) {
-          this.rebateamount = this.tool.formatAmount(
-            +this.mainData.defaultamount / 2
-          );
-        } else {
-          this.rebateamount = this.mainData.rebateamount;
-        }
-        this.changeDataStructure();
-        this.queryUsedrebate();
+        this.tool.showMessage(res, async () => {
+          this.typeNew = ''
+          this.queryMainData();
+        });
+      }else {
+        return new Promise(async (re, rj) => {
+          const res = await this.$api.requested({
+            id: "20221108151302",
+            content: {
+              nocache: true,
+              sa_orderid: this.$route.query.id,
+            },
+          });
+          this.mainData = res.data;
+          this.checked = this.mainData.rebate_used;
+          if (this.mainData.rebateamount > this.mainData.defaultamount) {
+            this.rebateamount = this.tool.formatAmount(
+                +this.mainData.defaultamount / 2
+            );
+          } else {
+            this.rebateamount = this.mainData.rebateamount;
+          }
+          this.changeDataStructure();
+          this.queryUsedrebate();
 
-        re();
-      });
+          re();
+        });
+      }
     },
     changeDataStructure() {
       let that = this;
@@ -540,17 +557,21 @@ export default {
         }
       )
         .then(async () => {
-          const res = await this.$api.requested({
-            id: type === "审核" ? 20221108153502 : 20221108153402,
-            content: {
-              sa_orderid: this.mainData.sa_orderid,
-              sys_enterpriseid: this.mainData.sys_enterpriseid,
-              sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
-            },
-          });
-          this.tool.showMessage(res, async () => {
-            this.queryMainData();
-          });
+          if (this.$refs.prod.time == null){
+            const res = await this.$api.requested({
+              id: type === "审核" ? 20221108153502 : 20221108153402,
+              content: {
+                sa_orderid: this.mainData.sa_orderid,
+                sys_enterpriseid: this.mainData.sys_enterpriseid,
+                sa_accountclassid: this.mainData.accountclass.sa_accountclassid,
+              },
+            });
+            this.tool.showMessage(res, async () => {
+              this.queryMainData();
+            });
+          }else {
+            this.typeNew = type
+          }
         })
         .catch((err) => {
           this.$message({

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -611,6 +611,7 @@ export default {
         id: 20221109093602,
         content: val,
       });
+      this.time = null
       if (res.code == 1) {
         this.$emit("onSuccess");
         fn ? fn() : "";

src/SManagement/archives/components/Drawer.vue

@@ -77,6 +77,7 @@ export default {
     font-family: PingFang SC-Bold, PingFang SC;
     font-weight: bold;
     color: #333333;
+    margin: 10px 0 20px 0;
   }
   .el-drawer__body .people {
     font-size: 14px;