代码上传

src/Form/remitvoucher/add.vue

@@ -176,6 +176,9 @@ export default {
         bankcardno:[
           { required: true, message: '银行编号', trigger: 'blur'},
         ],
+        amount:[
+          { required: true, message: '凭证总金额', trigger: 'blur'},
+        ],
       }
     }
   },
@@ -219,7 +222,7 @@ export default {
             return {
               "sa_paybilldetailid": 0,
               "sa_accountclassid": item.sa_accountclassid,
-              "amount": item.amount
+              "amount": item.amount === '' ? 0 : item.amount
             }
           })
           if (data.length > 0) {
@@ -283,11 +286,13 @@ export default {
       let res = await this.$api.requested({
         "id": "20221228085004",
         "content": {
+            "sa_paybillid":0,
             "where":{
                 "condition":""
             }
         }
       })
+      res.data.forEach(item => item.amount = 0)
       this.list = res.data
       console.log(this.list);
       

src/Form/remitvoucher/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="editBtn">编 辑</el-button>
+    <el-button :disabled="disabled" size="mini" type="primary" @click="editBtn">编 辑</el-button>
     <el-dialog :visible.sync="drawer2" title="选择财务信息" append-to-body width="50%">
       <el-table
         ref="multipleTable"
@@ -124,7 +124,7 @@ import remitDetail from "@/HDrpManagement/remitvoucher/modules/remitDetail"
 import Del from "@/HDrpManagement/remitvoucher/modules/delDetail"
 
 export default {
-  props:['data'],
+  props:['data','disabled'],
   name: "add",
   components: {selectAgentInfo,selectTable,remitDetail,Del},
   data(){

src/HDrpManagement/contractManage/components/editBtn.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button :disabled="data.status != '新建'" size="mini" @click="editBtn">编 辑</el-button>
+    <el-button :disabled="data.status != '新建'" type="primary" size="mini" @click="editBtn">编 辑</el-button>
     <el-drawer
       title="我是标题"
       :visible.sync="drawer"

src/HDrpManagement/contractManage/components/taskTarget/addTarget.vue

@@ -0,0 +1,71 @@
+<template>
+  <div>
+    <el-button type="primary" size="small" :disabled="disabled" @click="addBtn">添 加</el-button>
+    <el-dialog title="添加年度" append-to-body :visible.sync="visible" width="400px"> 
+      <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
+        <el-form-item label="年度:" prop="year">
+          <el-date-picker
+            v-model="form.year"
+            type="year"
+            value-format="yyyy"
+            placeholder="选择年">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer">
+        <el-button size="small" @click="visible=false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data','disabled'],
+  name: '',
+  data() {
+    return {
+      visible:false,
+      form: {
+        year: '2022'
+      },
+      rules:{
+        year:[
+          { required: true, message: '请选择年度', trigger: 'change'},
+        ],
+      }
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  methods: {
+    addBtn () {
+      this.visible=true
+      this.form.year = this.$parent.year
+
+      
+    },
+    async submit () {
+      let res = await this.$api.requested({
+        "id": 20221229104202,
+        "content": {
+            "year": this.form.year,
+            "sa_salestargetbillid": 0, //新建年度是为0，添加人员时为具体的数据id
+            "sys_enterpriseid": this.data.sys_enterpriseid
+        },
+      })
+      this.tool.showMessage(res,() => {
+        this.visible = false
+        this.$emit('onSuccess')
+      })
+    }
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/contractManage/components/taskTarget/delTarget.vue

@@ -0,0 +1,39 @@
+<template>
+  <div>
+    <el-popconfirm title="确定删除当前目标吗？" @confirm="deleteRow()">
+      <el-button slot="reference" size="mini" type="text" :disabled="disabled">删 除</el-button>
+    </el-popconfirm>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  props:['id','disabled'],
+  data() {
+    return {
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  methods: {
+    async deleteRow() {
+      let res = await this.$api.requested({
+        "id":'20221229141102',
+        "content": {
+          sa_salestargetbillid:this.id
+        }
+      })
+      this.tool.showMessage(res,() => {
+        this.$emit('onSuccess')
+      })
+    },
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/contractManage/components/taskTarget/editTarget.vue

@@ -129,7 +129,7 @@ export default {
       this.form.y1l = this.form.s1l + this.form.s2l + this.form.s3l + this.form.s4l
       this.form.y1h = this.form.s1h + this.form.s2h + this.form.s3h + this.form.s4h
       const res = await this.$api.requested({
-        "id": 20220902162902,
+        "id": 20221229111502,
         "content": this.form
       })
       this.tool.showMessage(res,()=>{

src/HDrpManagement/contractManage/components/taskTarget/taskTarget.vue

@@ -324,9 +324,10 @@
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="操作" fixed="right">
+      <el-table-column label="操作" fixed="right" width="120">
         <template slot-scope="scope">
           <slot name="edit" :data="scope.row"></slot>
+          <slot name="delete" :data="scope.row"></slot>
         </template>
       </el-table-column>
     </el-table>
@@ -357,10 +358,10 @@ export default {
       param:{
         "id": 20221209150102,
         "content": {
-          "nocache":true,
-            "hrid": 25,
+            "nocache":true,
+            "sys_enterpriseid": 0,//企业id
             "where": {
-                "year": 2022
+                // "year": 2022
             }
         },
       }
@@ -372,7 +373,7 @@ export default {
     },
     async queryData () {
       this.param.content.where.year = this.year
-      this.param.content.hrid = this.data.saler_hrid
+      this.param.content.sys_enterpriseid = this.data.sys_enterpriseid
       /*this.param.content.where.condition = this.condition*/
       const res = await this.$api.requested(this.param)
       this.tableData = res.data

src/HDrpManagement/contractManage/index.vue

@@ -82,6 +82,22 @@
           <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '工具借用'">工具使用协议</span>
           <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '居间'">居间协议</span>
         </div>
+        <div  v-else-if="scope.data.column.columnname == 'discountrate'">
+<!--          <div v-if="scope.data.column.data"></div>-->
+<!--          {{scope.data.column.data[[scope.data.column.columnname]] <1 ?(scope.data.column.data[[scope.data.column.columnname]] * 100).toFixed(2):100}}-->
+          <div v-if="scope.data.column.data.type === '框架'">
+            {{scope.data.column.data.discountrate<1?Math.round((scope.data.column.data.discountrate * 100)*100)/100:100}}
+          </div>
+          <div v-else-if="scope.data.column.data.type === '居间'">
+            <span v-if="scope.data.column.data.calculatemodel === 1">
+              {{scope.data.column.data.orderratio<1?Math.round((scope.data.column.data.orderratio * 100)*100)/100:100}}
+            </span>
+            <span v-if="scope.data.column.data.calculatemodel === 2">
+              {{scope.data.column.data.productdiscount<1?Math.round((scope.data.column.data.productdiscount * 100)*100)/100:100}}
+            </span>
+          </div>
+          <div v-else>--</div>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/HDrpManagement/contractManage/modules/detail.vue

@@ -9,6 +9,8 @@
         idname="sa_contractid"
         ownertable="sa_contract"
         :tabs="mainData.type === '项目' ? ['产品清单','合同条款'] : mainData.type === '框架' ? ['产品明细折扣','产品类别折扣','业绩目标'] : mainData.type === '居间' ? false : ['工具清单','合同条款']"
+        delApiId="20221121202502"
+        :statusCheck="[{key:'status',value:'已提交'},{key:'status',value:'审核'},{key:'status',value:'已终止'}]"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -16,7 +18,7 @@
       <div slot="customOperation" >
         <editBtn :modelList="modelList" v-if="tool.checkAuth($route.name,'update')" :disabled="mainData.status != '新建' || !isLeader" @onSuccess="queryMainData();$refs.billno && $refs.billno.listData()" :data="mainData" class="inline-16"/>
         <submit-check :disabled="!isLeader" ref="submit" :data="mainData" @onSuccess="queryMainData" />
-        <reverseCheck @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status != '新建'" />
+        <reverseCheck @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status != '新建' && mainData.status != '已终止'" />
         <contractOver v-if="tool.checkAuth($route.name,'contractOver') && mainData.status != '已终止' && mainData.status != '审核' && isLeader" :disabled="!isLeader" :id="mainData.sa_contractid" @onSuccess="queryMainData"/>
         <Del :idName="20221121202502" :id="mainData.sa_contractid" idKey="sa_contractids" class="inline-16" v-if="tool.checkAuth($route.name,'delete') && mainData.type == '新建' && isLeader"/>
       </div>
@@ -125,8 +127,14 @@
       <div slot="slot2">
         <!--业绩目标-->
         <taskTarget ref="taskTarget" v-if="Object.keys(mainData).length > 0 && mainData.type == '框架'" :data="mainData">
+          <template v-slot:addTarget="scope">
+              <add-target :disabled="mainData.status != '新建' || !isLeader" v-if="tool.checkAuth($route.name,'taskTargetManage')" :data="mainData" @onSuccess="$refs.taskTarget.queryData()"></add-target>
+          </template>
           <template v-slot:edit="scope">
-            <edit-target :disabled="mainData.status != '新建' || !isLeader" v-if="tool.checkAuth($route.name,'taskTargetManage')" :data="scope.data" :salerId="mainData" @onSuccess="$refs.taskTarget.queryData()"/>
+            <edit-target class="inline-16" :disabled="mainData.status != '新建' || !isLeader" v-if="tool.checkAuth($route.name,'taskTargetManage')" :data="scope.data" :salerId="mainData" @onSuccess="$refs.taskTarget.queryData()"/>
+          </template>
+          <template v-slot:delete="scope">
+            <del-target @onSuccess="$refs.taskTarget.queryData()" class="inline-16" :disabled="mainData.status != '新建' || !isLeader" v-if="tool.checkAuth($route.name,'taskTargetManage')" :id="scope.data.sa_salestargetbillid"></del-target>
           </template>
         </taskTarget>
       </div>
@@ -148,7 +156,9 @@ import addClass from '../components/productClassList/addProduct'
 import productClassList from '../components/productClassList/productClassList'
 import contractClause from '../components/contractClause/contractClause'
 import editTarget from '../components/taskTarget/editTarget'
-import taskTarget from '../components/taskTarget//taskTarget'
+import addTarget from '../components/taskTarget/addTarget'
+import taskTarget from '../components/taskTarget/taskTarget'
+import delTarget from '../components/taskTarget/delTarget'
 import contractOver from '../components/contractOver'
 import reverseCheck from '../components/reverseCheck'
 export default {
@@ -177,7 +187,9 @@ export default {
     editTarget,
     taskTarget,
     contractOver,
-    reverseCheck
+    reverseCheck,
+    addTarget,
+    delTarget
   },
   watch: {
     mainData: {

src/HDrpManagement/remitvoucher/modules/addRemit.vue

@@ -10,7 +10,7 @@
         <selectTable @selectChange="selectChange" v-if="dialogFormVisible" idName="sa_accountclassid" ref="table" v-model="result" :layout="tablecols" :data="orderList" :custom="true" height="500px"  @upDateData="upDateData">
            <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname == 'amount'">
-                <el-input :disabled="!isEdit(scope.column.data)" v-model="scope.column.data.amount" size="small"></el-input>
+                <el-input :disabled="!isEdit(scope.column.data)" v-model.number="scope.column.data.amount" size="small"></el-input>
               </div>
               <div v-else>{{scope.column.data[scope.column.columnname]}}</div>
             </template>
@@ -39,6 +39,7 @@
 
 <script>
 import selectTable from '@/components/selectTable/index'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   name: "add",
   props:['data','disabled'],
@@ -57,6 +58,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
+          "sa_paybillid":this.$route.query.id,
           "where": {
               "condition": ""
           }
@@ -69,7 +71,6 @@ export default {
       return function (data) {
         console.log(this.selectArr.some(item => item == data));
         let is = this.selectArr.some(item => item == data)
-        // if(!is) data.amount = ''
         return is
       }
     }
@@ -91,27 +92,43 @@ export default {
       this.getOrderList()
     },
     async onSubmit(){
-      let data = this.$refs.table.allArr.map(item => {
-        return {
-          "sa_paybilldetailid": 0,
-          "sa_accountclassid": item.sa_accountclassid,
-          "amount": item.amount
-        }
-      })
-      let res2 = await this.$api.requested({
-        "id": "20221227092904",
-        "content": {
-            "sa_paybillid": this.$route.query.id,
-            "paybilldetails": data
-        }
-      })
-      this.tool.showMessage(res2,()=>{
-        this.$emit('onSuccess')
-        this.dialogFormVisible = false
+      let isNumber = this.$refs.table.allArr.every(item => {
+        return typeof item.amount == 'number'
       })
+      if (isNumber) {
+        let data = this.$refs.table.allArr.map(item => {
+          return {
+            "sa_paybilldetailid": 0,
+            "sa_accountclassid": item.sa_accountclassid,
+            "amount": item.amount
+          }
+        })
+        let res2 = await this.$api.requested({
+          "id": "20221227092904",
+          "content": {
+              "sa_paybillid": this.$route.query.id,
+              "paybilldetails": data
+          }
+        })
+        this.tool.showMessage(res2,()=>{
+          this.$emit('onSuccess')
+          this.dialogFormVisible = false
+        })
+      } else {
+        this.$message({
+          title:'提示',
+          message:'请输入数字',
+          type:"warning"
+        })
+      }
+      
     },
     async getOrderList () {
+      this.params.content.sa_paybillid = this.$route.query.id
       let res = await this.$api.requested(this.params)
+      res.data.forEach(item => item.amount = 0)
+      console.log(res.data);
+      
       this.orderList = res.data
       this.total = res.total
       console.log(res);

src/HDrpManagement/remitvoucher/modules/delDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-popconfirm :title="'确定删除当前打款明细吗？'" @confirm="deleteRow()">
-      <el-button slot="reference" size="mini" type="text">删 除</el-button>
+      <el-button :disabled="disabled" slot="reference" size="mini" type="text">删 除</el-button>
     </el-popconfirm>
   </div>
 </template>
@@ -13,7 +13,7 @@ export default {
     return {
     };
   },
-  props:['id'],
+  props:['id','disabled'],
   computed:{
   },
   watch:{

src/HDrpManagement/remitvoucher/modules/detail.vue

@@ -3,7 +3,6 @@
     <basicDetails
         ref="details"
         :titleText="mainData.billno"
-        :oldFormPath="{edit:'HManagement/accountManage/modules'}"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20221226152904"
@@ -18,19 +17,19 @@
       <div slot="tags">
       </div>
       <div slot="customOperation">
-        <Edit v-if="tool.checkAuth($route.name,'update')" class="inline-16" @onSuccess="$refs.remitDetail.listData()" :data="mainData"/>
+        <Edit v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" class="inline-16" @onSuccess="$refs.remitDetail.listData()" :data="mainData"/>
         <el-button v-if="mainData.status == '新建' && tool.checkAuth($route.name,'submit')" class="inline-16" type="primary" @click="submit" size="mini">提 交</el-button>
         <Check v-if="mainData.status == '提交' && tool.checkAuth($route.name,'check')" class="inline-16" @onSuccess="queryMainData()"/>
         <el-button v-if="mainData.status != '新建' && tool.checkAuth($route.name,'back')" class="inline-16" type="primary" @click="back" size="mini">退 回</el-button>
       </div>
       <div slot="slot0" >
         <remit-detail ref="remitDetail" @onSuccess="queryMainData" v-if="mainData">
-          <add-remit v-if="tool.checkAuth($route.name,'remitvoucherManage')" slot="addRemit" :data="mainData" @onSuccess="$refs.remitDetail.listData()"></add-remit>
+          <add-remit :disabled="mainData.status != '新建'" v-if="tool.checkAuth($route.name,'remitvoucherManage')" slot="addRemit" :data="mainData" @onSuccess="$refs.remitDetail.listData()"></add-remit>
           <template v-slot:editRemit="scope">
-              <el-button v-if="tool.checkAuth($route.name,'remitvoucherManage')" class="inline-16" type="text" size="mini" @click="$refs.remitDetail.currentItem=scope.data">编 辑</el-button>
+              <el-button :disabled="mainData.status != '新建'" v-if="tool.checkAuth($route.name,'remitvoucherManage')" class="inline-16" type="text" size="mini" @click="$refs.remitDetail.currentItem=scope.data">编 辑</el-button>
           </template>
           <template v-slot:delRemit="scope">
-            <Del v-if="tool.checkAuth($route.name,'remitvoucherManage')" class="inline-16" :id="scope.data.sa_paybilldetailid" @onSuccess="$refs.remitDetail.listData()"></Del>
+            <Del :disabled="mainData.status != '新建'" v-if="tool.checkAuth($route.name,'remitvoucherManage')" class="inline-16" :id="scope.data.sa_paybilldetailid" @onSuccess="$refs.remitDetail.listData()"></Del>
           </template>
         </remit-detail>
       </div>

src/HManagement/clueManage/clue_import/detailPage/modules/edit.vue

@@ -7,7 +7,8 @@
       size="800px"
       direction="rtl"
       append-to-body
-      :show-close="false">
+      :show-close="false"
+      @close="onClose">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rule" ref="form" label-width="90px" label-position="right" size="small">
           <el-col :span="20">
@@ -16,7 +17,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <businessMessage :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
+            <businessMessage ref="businessMessage" :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
           </el-col>
           <el-col :span="24">
             <el-form-item label="联系人" prop="name">
@@ -62,7 +63,7 @@
         </el-form>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -138,6 +139,10 @@ export default {
       this.form.address = val.address
       this.areaSelectResult = [val.regProvince,val.regCity,val.regArea]
       this.form.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.drawer = false
+      this.$refs.businessMessage.businessShow = false
     }
   }
 }

src/HManagement/clueManage/clue_private/modules/add.vue

@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label-width="0" >
-              <businessMessage :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
+              <businessMessage ref="businessMessage" :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
             </el-form-item>
 <!--            <businessMessage :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>-->
           </el-col>
@@ -157,6 +157,7 @@ export default {
     onClose () {
       this.$refs['ruleForm'].resetFields()
       this.activityVisible = false
+      this.$refs.businessMessage.businessShow = false
     },
     centerChange (data) {
       this.param.content.campaign_name = data[0].name

src/HManagement/clueManage/clue_private/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑线索" :show-close="false" append-to-body :visible.sync="dialogFormVisible" size="600px">
+    <el-drawer title="编辑线索" :show-close="false" append-to-body :visible.sync="dialogFormVisible" size="600px" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="form" :rules="rules" label-position="right" label-width="80px" size="small">
@@ -11,7 +11,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <businessMessage :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
+              <businessMessage ref="businessMessage" :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
             </el-col>
             <el-col :span="24">
               <el-form-item label="联系人" prop="name">
@@ -65,7 +65,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -144,6 +144,11 @@ export default {
       this.form.address = val.address
       this.areaSelectResult = [val.regProvince,val.regCity,val.regArea]
       this.form.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.dialogFormVisible = false
+      this.activityVisible = false
+      this.$refs.businessMessage.businessShow = false
     }
   },
   mounted () {

src/HManagement/clueManage/clue_public/modules/add.vue

@@ -13,7 +13,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label-width="0" >
-                <businessMessage :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
+                <businessMessage ref="businessMessage" :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -64,7 +64,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="addOrdercule" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -144,6 +144,9 @@ export default {
     },
     onClose () {
       this.$refs['ruleForm'].resetFields()
+      this.drawer = false
+      this.$refs.businessMessage.businessShow = false
+      this.activityVisible = false
     },
     centerChange (data) {
       this.param.content.campaign_name = data[0].name

src/HManagement/clueManage/clue_public/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑线索" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="600px">
+    <el-drawer title="编辑线索" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="600px" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="form" :rules="rule" ref="form" label-position="right" label-width="80px" size="small">
@@ -12,7 +12,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label-width="0" >
-                <businessMessage :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
+                <businessMessage ref="businessMessage" :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -68,7 +68,7 @@
       </div>
       
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -134,6 +134,11 @@ export default {
       this.form.enterprisename = val.companyName
       this.form.address = val.address
       this.form.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.dialogFormVisible = false
+      this.$refs.businessMessage.businessShow = false
+      this.activityVisible = false
     }
   },
   mounted () {

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

@@ -7,7 +7,8 @@
       :show-close="false"
       size="800px"
       direction="rtl"
-      append-to-body>
+      append-to-body
+      @close="onClose">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
           <el-col :span="20">
@@ -16,7 +17,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <businessMessage :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
+            <businessMessage ref="businessMessage" :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
           </el-col>
           <el-col :span="24">
             <el-form-item label="联系人" prop="name">
@@ -62,7 +63,7 @@
         </el-form>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false,$refs.form.resetFields()" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="add()" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -146,6 +147,10 @@ export default {
       this.form.enterprisename = val.companyName
       this.form.address = val.address
       this.form.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.drawer = false
+      this.$refs.businessMessage.businessShow = false
     }
   }
 }

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>
@@ -95,6 +95,7 @@
 export default {
   data () {   
     var validatePass2 = (rule, value, callback) => {
+      console.log(value)
       if (value.length === 0) {
         callback(new Error('请设置提报周期'));
       } else {
@@ -130,11 +131,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) {

src/SDrpManagement/QuotedPrice/components/edit/quotedPriceProduct.vue

@@ -156,7 +156,7 @@
           fixed="right"
           width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
+            <el-input v-model="scope.row.price" size="mini" type="number" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -258,11 +258,14 @@ export default {
       this.list = res.data
       this.total = res.total
       this.totalPrice = 0
-      for (var i=0 ;i<this.list.length;i++){
-        this.list[i].discountrate = this.list[i].discountrate * 100
-        this.list[i].mindiscountrate = this.list[i].mindiscountrate * 100
-        this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
+      for (var i=0 ;i<res.data.length;i++){
+        this.list[i].discountrate = res.data[i].discountrate * 100
+        this.list[i].mindiscountrate = res.data[i].mindiscountrate * 100
+        this.list[i].price = res.data[i].price.toFixed(2)
+        this.list[i].discountDifferenceAmount = res.data[i].discountDifferenceAmount.toFixed(2)
+        this.totalPrice = this.totalPrice + res.data[i].qty * res.data[i].price
       }
+      this.totalPrice = this.totalPrice.toFixed(2)
       this.$emit('productData',this.list)
     },
     handleSizeChange(val) {
@@ -345,7 +348,7 @@ export default {
         val = data.marketprice * 0.1
       }
       data.discountrate = ((val / data.marketprice) * 100).toFixed(2)
-      data.amount = data.qty * data.price
+      data.amount = (data.qty * data.price).toFixed(2)
       this.$set(this.list,index,data)
       this.totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){

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.toFixed(2)
         },
         {
           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
@@ -260,11 +260,14 @@ export default {
       this.list = res.data
       this.total = res.total
       this.totalPrice = 0
-      for (var i=0 ;i<this.list.length;i++){
-        this.list[i].discountrate = this.list[i].discountrate * 100
-        this.list[i].mindiscountrate = this.list[i].mindiscountrate * 100
-        this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
+      for (var i=0 ;i<res.data.length;i++){
+        this.list[i].discountrate = (res.data[i].discountrate * 100).toFixed(2)
+        this.list[i].mindiscountrate = (res.data[i].mindiscountrate * 100).toFixed(2)
+        this.list[i].price = res.data[i].price.toFixed(2)
+        this.list[i].discountDifferenceAmount = res.data[i].discountDifferenceAmount.toFixed(2)
+        this.totalPrice = this.totalPrice + res.data[i].qty * res.data[i].price
       }
+      this.totalPrice = this.totalPrice.toFixed(2)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/SManagement/orderclue/components/add.vue

@@ -13,7 +13,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label-width="0" >
-                <businessMessage :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
+                <businessMessage ref="businessMessage" :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -64,7 +64,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="addOrdercule" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -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')
           })
       })
@@ -156,7 +171,25 @@ export default {
       this.areaSelectResult = result
     },
     onClose () {
+      this.drawer = false
       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":''
+      }
+      this.$refs.businessMessage.businessShow = false
     },
     centerChange (data) {
       this.param.content.campaign_name = data[0].name

src/SManagement/orderclue/components/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="edit">
     <el-button size="mini" :type="disabled ? 'defalt':'primary'" :disabled="disabled" @click="editBtn">编 辑</el-button>
-    <el-drawer title="编辑线索" :visible.sync="drawer" size="600px" direction="rtl" append-to-body>
+    <el-drawer title="编辑线索" :visible.sync="drawer" size="600px" direction="rtl" append-to-body :show-close="false" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="param" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm"
@@ -13,7 +13,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label-width="0" >
-                <businessMessage :keyWord="param.enterprisename" @businessData="businessData"></businessMessage>
+                <businessMessage :keyWord="param.enterprisename" ref="businessMessage" @businessData="businessData"></businessMessage>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -64,7 +64,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="addOrdercule" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -186,6 +186,10 @@ export default {
       this.param.address = val.address
       this.areaSelectResult = [val.regProvince,val.regCity,val.regArea]
       this.param.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.$refs.businessMessage.businessShow = false
+      this.drawer = false
     }
   },
 }

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()
     }
   }
 }

src/SManagement/user/user-info/components/PassEdit.vue

@@ -82,6 +82,7 @@ export default {
                 type:'success'
               })
               this.$refs.form.resetFields()
+              this.dialogVisible = false
             } else {
               this.$notify({
                 title:'提示',