Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/HManagement/salesForecastTemplate/index.vue

@@ -3,7 +3,7 @@
     <add v-if="tool.checkAuth($route.name,'insert')" @onSuccess="onSuccess"></add>
     <tepList ref="teplist" @tableRowClick="tableRowClick">
       <template v-slot:edit="scope">
-        <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data"></edit>
+        <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data" @onSuccess="onSuccess"></edit>
       </template>
       <template v-slot:del="scope">
         <ondel v-if="tool.checkAuth($route.name,'delete')" :data="scope.data" @onSuccess="onSuccess"></ondel>

src/HManagement/salesForecastTemplate/modules/add.vue

@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="提报要求">
-              <el-checkbox v-model="form.baseonproject" :true-label="1" :false-label="0">按项目预测</el-checkbox>
+              <el-checkbox v-model="form.baseonproject" :true-label="1" :false-label="0">按项目及产品类别预测</el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -152,6 +152,20 @@ export default {
         callback();
       }
     },
+    validateEndDate(rule, value, callback){
+      let start = (new Date(this.form.begdate)).getTime()
+      let end = (new Date(this.form.enddate)).getTime()
+      if (value === '') {
+        callback(new Error('请选择结束日期'));
+      } else if (end < start) {
+        callback(new Error('结束日期不能小于开始日期'));
+      } else {
+        // if (this.form.enddate !== '') {
+        //   this.$refs['form'].validateField('enddate');
+        // }
+        callback();
+      }
+    },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
@@ -205,20 +219,6 @@ export default {
         }
       })
       this.rolelist = res.data
-    },
-    validateEndDate(rule, value, callback){
-      let start = (new Date(this.form.begdate)).getTime()
-      let end = (new Date(this.form.enddate)).getTime()
-      if (value === '') {
-        callback(new Error('请选择结束日期'));
-      } else if (end < start) {
-        callback(new Error('结束日期不能小于开始日期'));
-      } else {
-        // if (this.form.enddate !== '') {
-        //   this.$refs['form'].validateField('enddate');
-        // }
-        callback();
-      }
     }
   },
   mounted () {

src/HManagement/salesForecastTemplate/modules/edit.vue

@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="提报要求">
-              <el-checkbox v-model="form.baseonproject" :true-label="1" :false-label="0">按项目预测</el-checkbox>
+              <el-checkbox v-model="form.baseonproject" :true-label="1" :false-label="0">按项目及产品类别预测</el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -130,7 +130,7 @@ export default {
           { required: true, message: '请选择开始日期', trigger: 'change' }
         ],
         enddate: [
-          { required: true, message: '请选择结束日期', trigger: 'change' }
+          { validator:this.validateEndDate, required: true, trigger: 'change' }
         ],
         taskdays:[
           { required: true, message: '请输提醒天数', trigger: 'blur' },
@@ -154,6 +154,20 @@ export default {
         callback();
       }
     },
+    validateEndDate(rule, value, callback){
+      let start = (new Date(this.form.begdate)).getTime()
+      let end = (new Date(this.form.enddate)).getTime()
+      if (value === '') {
+        callback(new Error('请选择结束日期'));
+      } else if (end < start) {
+        callback(new Error('结束日期不能小于开始日期'));
+      } else {
+        // if (this.form.enddate !== '') {
+        //   this.$refs['form'].validateField('enddate');
+        // }
+        callback();
+      }
+    },
     async queryMainData (fn) {
       const res = await this.$api.requested({
         "id": 20220906150303,

src/HManagement/salesForecastTemplate/modules/templateList.vue

@@ -13,7 +13,7 @@
           <span :style="scope.column.data.status === '发布'?'color:#52C41A':''">{{scope.column.data.status}}</span>
         </div>
         <div v-else-if="scope.column.columnname === 'baseonproject'">
-          <span>{{scope.column.data.baseonproject === 1?'按项目预测':'无'}}</span>
+          <span>{{scope.column.data.baseonproject === 1?'按产品类别及项目预测':'按产品类别预测'}}</span>
         </div>
         <div v-else-if="scope.column.columnname === 'taskdays'">
           <span>提前{{scope.column.data.taskdays}}天</span>

src/components/dynamic-table/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%"  border>
+    <el-table :row-class-name="tableClassName" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%"  border>
       <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width" :fixed="col.columnname === fixedName?'right':false">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->

src/router/HDrpManagement.js

@@ -1,4 +1,4 @@
-const DrpManagement = [
+const HDrpManagement = [
   
 ]
-export default DrpManagement
+export default HDrpManagement

src/router/SDrpManagement.js

@@ -1,4 +1,4 @@
-const DrpManagement = [
+const SDrpManagement = [
   
 ]
-export default DrpManagement
+export default SDrpManagement

yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.a591369e.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.888247d1.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.1497085c.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.0169833a.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>