暂存

src/HManagement/salesForecastTemplate/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="queryRoles(dialogFormVisible = true)">新 建</el-button>
-    <el-drawer append-to-body title="新建模板" :visible.sync="dialogFormVisible" size="800px" @close="onClose">
+    <el-drawer append-to-body title="新建模板" :visible.sync="dialogFormVisible" size="800px" @close="onClose" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" ref="form" :rules="rules" label-position="right" label-width="80px" size="small">
@@ -16,7 +16,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="提报类型">
+              <el-form-item label="提报类型" prop="isrepeat">
                 <el-radio-group v-model="form.isrepeat" @change="onRadioChange">
                   <el-radio :label="1">月度提报</el-radio>
                   <el-radio :label="0">单次提报</el-radio>
@@ -130,11 +130,14 @@ export default {
           { required: true, message: '请选择角色', trigger: 'change' }
         ],
         periodpoint:[
-          { validator: validatePass2, trigger: 'change' }
+          { required: true, validator: validatePass2, trigger: 'change' }
         ],
         taskdays:[
-          { validator: validatePass2, trigger: 'change' }
+          { required: true, validator: validatePass2, trigger: 'change' }
         ],
+        isrepeat:[
+          { required: true, message: '请选择提报类型', trigger: 'change' }
+        ]
       },
       pickerOptions:{
         disabledDate(time) {

src/HManagement/salesForecastTemplate/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button :type="data.status === '结束' ||  data.status === '发布'?'':'primary'" :disabled="data.status === '结束' ||  data.status === '发布' "  size="mini" @click="onShow(dialogFormVisible = true)">编 辑</el-button>
-    <el-drawer append-to-body title="编辑模板" :visible.sync="dialogFormVisible" size="800px">
+    <el-drawer append-to-body title="编辑模板" :visible.sync="dialogFormVisible" size="800px" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" ref="form" :rules="rules" label-position="right" label-width="80px" size="small">
@@ -11,12 +11,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="提报要求">
+              <el-form-item label="提报要求" >
                 <el-input type="text" v-model="form.remarks" placeholder="输入提报要求"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="提报类型">
+              <el-form-item label="提报类型" prop="isrepeat">
                 <el-radio-group v-model="form.isrepeat" @change="onRadioChange">
                   <el-radio :label="1">月度提报</el-radio>
                   <el-radio :label="0">单次提报</el-radio>
@@ -123,11 +123,14 @@ export default {
           { required: true, message: '请选择角色', trigger: 'change' }
         ],
         periodpoint:[
-          { validator: validatePass2, trigger: 'change' }
+          { required: true, validator: validatePass2, trigger: 'change' }
         ],
         taskdays:[
-          { validator: validatePass2, trigger: 'change' }
+          { required: true, validator: validatePass2, trigger: 'change' }
         ],
+        isrepeat:[
+          { required: true, message: '请选择提报类型', trigger: 'change' }
+        ]
       },
       pickerOptions:{
         disabledDate(time) {
@@ -158,7 +161,6 @@ export default {
           e.taskday = t
         })
       })
-      console.log(this.sdList)
       this.form = Object.assign({},this.form, this.data)
       this.form.roles = this.form.roles.map(e=>{
         return e.roleid

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -142,8 +142,8 @@ export default {
           value:this.mainData.begdate?this.mainData.begdate + '至' + this.mainData.enddate:"--"
         },
         {
-          label:'总金额',
-          value:this.totalPrice + '元'
+          label:'总金额(元)',
+          value:this.totalPrice
         },
         {
           label:'联系人',

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -194,7 +194,7 @@
         </el-table-column>-->
       </el-table>
       <div style="height: 35px;margin-top: 20px">
-        <div style="float: left">总金额：{{ totalPrice }}元</div>
+        <div style="float: left">总金额(元)：{{ totalPrice }}</div>
         <div style="float: right">
           <el-pagination
               background

src/SManagement/orderclue/components/add.vue

@@ -147,6 +147,21 @@ export default {
             this.$refs.ruleForm.resetFields()
             this.drawer = false  
             this.areaSelectResult = []
+            this.param.content = {
+              "sat_orderclueid": 0,
+              "enterprisename":"",
+              "name": "",
+              "phonenumber": "",
+              "province": "",
+              "city": "",
+              "county": "",
+              "address": "",
+              "notes": "",
+              "cluesource": "",
+              "sat_campaignid":0,
+              "isprivate":1,
+              "campaign_name":''
+            }
             this.$emit('onSuccess')
           })
       })
@@ -157,6 +172,22 @@ export default {
     },
     onClose () {
       this.$refs['ruleForm'].resetFields()
+      this.activityVisible = false
+      this.param.content = {
+        "sat_orderclueid": 0,
+        "enterprisename":"",
+        "name": "",
+        "phonenumber": "",
+        "province": "",
+        "city": "",
+        "county": "",
+        "address": "",
+        "notes": "",
+        "cluesource": "",
+        "sat_campaignid":0,
+        "isprivate":1,
+        "campaign_name":''
+      }
     },
     centerChange (data) {
       this.param.content.campaign_name = data[0].name

src/SManagement/sales_forecast/index.vue

@@ -10,6 +10,10 @@
       :detailPath="{path:'/product_detail'}"
       @listCreate="list">
       <div slot="custom">
+        <label class="search__label ">状态:</label>
+        <el-select  class="inline-24" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
+          <el-option v-for="(item,index) in statusData" :key="index" :value="item.value" :label="item.label"></el-option>
+        </el-select>
       </div>
       <div slot="titleRight" style="display:flex;margin-left:10px">
       </div>
@@ -58,6 +62,23 @@ export default {
     return {
       options:[
       ],
+      statusData:[
+        {
+          label:'待提报',
+          value:'待提报'
+        },
+        {
+          label:'提报中',
+          value:'提报中'
+        },
+        {
+          label:'已提报',
+          value:'已提报'
+        }
+      ],
+      selectParam: {
+        status:''
+      },
     }
   },
   filters: {
@@ -86,6 +107,10 @@ export default {
     },
     list (param) {
       param.content.nocache = true
+    },
+    selectChange(){
+      this.$refs.basicLayout.param.content.where = this.selectParam
+      this.$refs.basicLayout.listData()
     }
   }
 }