项目目标

src/Form/QuotedPrice/edit.vue

@@ -76,7 +76,7 @@
                         :total="project.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference" disabled :readonly="true" v-model="form.projectname" autocomplete="off" placeholder="请选择项目"  @input="selectProject"></el-input>
+                  <el-input slot="reference"  :readonly="true" v-model="form.projectname" autocomplete="off" placeholder="请选择项目"  @input="selectProject"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -132,13 +132,13 @@
                         small
                         @size-change="handleSizeChangeCustomer"
                         @current-change="handleCurrentChangeCustomer"
-                        :page-sizes="[10,20,50,100,]"
+                        :page-sizes="[10,20,50,100]"
                         layout="total,sizes, prev, pager, next, jumper"
                         :current-page="customer.currentPage"
                         :total="customer.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference" disabled :readonly="true"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                  <el-input slot="reference"  :readonly="true"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -515,6 +515,7 @@ export default {
       this.form.contactsid = 0
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
+      this.projectShow = false
     },
     /*客户选择信息*/
     customerData(val){
@@ -523,12 +524,14 @@ export default {
       this.form.contactsid = 0
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
+      this.customerShow = false
     },
     /*联系人选择信息*/
     contactsData(val){
       this.form.contactsid = val.contactsid
       this.form.contactsname = val.name
       this.form.contactsphonenumber = val.phonenumber
+      this.contactsShow = false
     },
     /*项目翻页*/
     handleSizeChangeProject(val) {

src/Form/QuotedPrice/editCopy.vue

@@ -69,7 +69,7 @@
                       :total="project.total">
                   </el-pagination>
                 </div>
-                <el-input slot="reference" disabled :readonly="true" v-model="form.projectname" autocomplete="off" placeholder="请选择项目"  @input="selectProject"></el-input>
+                <el-input slot="reference"  :readonly="true" v-model="form.projectname" autocomplete="off" placeholder="请选择项目"  @input="selectProject"></el-input>
               </el-popover>
             </el-form-item>
           </el-col>
@@ -131,7 +131,7 @@
                       :total="customer.total">
                   </el-pagination>
                 </div>
-                <el-input slot="reference" disabled :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                <el-input slot="reference"  :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
               </el-popover>
             </el-form-item>
           </el-col>
@@ -221,7 +221,7 @@
                       :total="contacts.total">
                   </el-pagination>
                 </div>
-                <el-input slot="reference" disabled :readonly="true" v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
+                <el-input slot="reference"  :readonly="true" v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
               </el-popover>
             </el-form-item>
           </el-col>
@@ -493,6 +493,7 @@ export default {
       this.form.contactsid = ''
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
+      this.projectShow = false
     },
     /*客户选择信息*/
     customerData(val){
@@ -501,12 +502,14 @@ export default {
       this.form.contactsid = ''
       this.form.contactsname = ''
       this.form.contactsphonenumber = ''
+      this.customerShow = false
     },
     /*联系人选择信息*/
     contactsData(val){
       this.form.contactsid = val.contactsid
       this.form.contactsname = val.name
       this.form.contactsphonenumber = val.phonenumber
+      this.contactsShow = false
     },
     /*项目翻页*/
     handleSizeChangeProject(val) {

src/HManagement/personalTarget/target/modules/addPersonal.vue

@@ -4,7 +4,7 @@
     <el-drawer
         title="人员编辑"
         :visible.sync="dialogTableVisible"
-        size="70%"
+        size="80%"
         direction="rtl"
         append-to-body
         @close="onCancel"
@@ -189,12 +189,12 @@ export default {
      /* this.leftData.param.content.where.condition = this.leftData.condition*/
       this.leftData.param.content.sa_salestargetbillid = this.data.sa_salestargetbillid
       const res = await this.$api.requested(this.leftData.param)
-      res.data.forEach(e => {
+      /*res.data.forEach(e => {
         e.marea = e.area.map(m=>{
           return `${m.province}${m.city}${m.county}`
         })
         e.marea = e.marea.join(',')
-      })
+      })*/
       this.leftData.list = res.data
       this.leftData.total = res.total
       this.leftData.currentPage = res.pageNumber
@@ -203,12 +203,12 @@ export default {
       /* this.leftData.param.content.where.condition = this.leftData.condition*/
       this.rightData.param.content.sa_salestargetbillid = this.data.sa_salestargetbillid
       const res = await this.$api.requested(this.rightData.param)
-      res.data.forEach(e => {
+      /*res.data.forEach(e => {
         e.marea = e.area.map(m=>{
           return `${m.province}${m.city}${m.county}`
         })
         e.marea = e.marea.join(',')
-      })
+      })*/
       this.rightData.list = res.data
       this.rightData.total = res.total
       this.rightData.currentPage = res.pageNumber

src/HManagement/personalTarget/target/modules/edit/components/editTarget.vue

@@ -42,7 +42,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="挑战目标">
-                <el-input v-model="form[`s${index+1}l`]" disabled autocomplete="off"></el-input>
+                <el-input v-model="form[`s${index+1}h`]" disabled autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24"></el-col>

src/HManagement/projectTarget/target/modules/addProject.vue

@@ -4,7 +4,7 @@
     <el-drawer
         title="人员编辑"
         :visible.sync="dialogTableVisible"
-        size="70%"
+        size="80%"
         direction="rtl"
         append-to-body
         :show-close="false"
@@ -188,12 +188,12 @@ export default {
      /* this.leftData.param.content.where.condition = this.leftData.condition*/
       this.leftData.param.content.sa_salestargetbillid = this.data.sa_salestargetbillid
       const res = await this.$api.requested(this.leftData.param)
-      res.data.forEach(e => {
+      /*res.data.forEach(e => {
         e.marea = e.area.map(m=>{
           return `${m.province}${m.city}${m.county}`
         })
         e.marea = e.marea.join(',')
-      })
+      })*/
       this.leftData.list = res.data
       this.leftData.total = res.total
       this.leftData.currentPage = res.pageNumber
@@ -202,12 +202,12 @@ export default {
       /* this.leftData.param.content.where.condition = this.leftData.condition*/
       this.rightData.param.content.sa_salestargetbillid = this.data.sa_salestargetbillid
       const res = await this.$api.requested(this.rightData.param)
-      res.data.forEach(e => {
+      /*res.data.forEach(e => {
         e.marea = e.area.map(m=>{
           return `${m.province}${m.city}${m.county}`
         })
         e.marea = e.marea.join(',')
-      })
+      })*/
       this.rightData.list = res.data
       this.rightData.total = res.total
       this.rightData.currentPage = res.pageNumber

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -190,25 +190,19 @@ export default {
           "sa_quotedpriceid":this.$route.query.id     //sat_notice_classid<=0时 为新增
         }
       })
-      console.log(res,"计算产品明细合计信息")
       this.totalPrice = 0
       res.data.forEach((item)=> {
-        console.log(item,"类别数据")
         this.totalPrice = this.totalPrice + item.price * item.qty
       })
-      console.log(this.totalPrice,'商品总价')
       /*this.queryMainData(this.$route.query.id)*/
       this.changeDataStructure()
     },
     onSuccess(){
       this.queryMainData(this.$route.query.id)
-      console.log("执行")
 
     }
   },
   mounted() {
-    console.log(this.$route.query.id)
-
     this.queryMainData(this.$route.query.id)
   }
 }

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

@@ -255,7 +255,6 @@ export default {
   methods:{
     /*产品配置信息*/
     async productData(){
-      console.log(this.data,"输出产品数据")
       this.param.content.sa_quotedpriceid = this.data.sa_quotedpriceid
       const res = await this.$api.requested(this.param)
       this.list = res.data
@@ -265,16 +264,7 @@ export default {
         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
-        console.log(this.list[i].discountDifferenceAmount,"差额")
-        /*if (this.list[i].discountDifferenceAmount > 0){
-          console.log("执行")
-          this.setColor.color = '#79da56'
-        }else if(this.list[i].discountDifferenceAmount < 0) {
-          console.log("执行233")
-          this.setColor.color = '#ef230c'
-        }*/
       }
-      console.log(this.list,'产品配置信息')
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -303,12 +293,9 @@ export default {
       this.$emit('checkForm')
     },
     quoterPrice(id,type){
-      console.log(id,"报价单id")
-      console.log(type,"项目报价")
       this.$refs.quoterPrice.queryProduct(id,type)
     },
     async deleteProduct(val){
-      console.log(val)
       const res = await this.$api.requested({
         "id": 20221021095603,
         "version":1,
@@ -322,7 +309,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.data)
     this.productData()
   }
 }

src/SDrpManagement/QuotedPrice/index.vue

@@ -196,9 +196,7 @@ export default {
         content: {},
         method: "queryUserMsg"
       })
-      console.log(res,"是否营销")
       this.issaler = res.data.hr.issaler
-      console.log(this.issaler)
     },
     async queryUserInfo() {
       let res = await this.$api.requested({
@@ -207,7 +205,6 @@ export default {
         "content": {
         }
       })
-      console.log(res.data);
 
       this.userInfo = {
         isAuth : res.data.hr.isleader,

src/SManagement/orderclue/components/follow.vue

@@ -6,7 +6,7 @@
         <el-form :model="param" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm"
           label-position="right">
           <el-form-item label="跟进时间">
-            <el-date-picker v-model="timer" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" size="small">
+            <el-date-picker v-model="timer" type="datetime" format="yyyy-MM-dd HH:mm:ss"  size="small">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="本次跟进方式" prop="followupmode">
@@ -63,7 +63,7 @@ export default {
         "address":"",//解析地址,
         "sat_ordercluefollowuplogid":0//传0新增
       },
-      timer: new Date(),
+      timer: '',
       rules: {
         content: [
           { required: true, message: '内容不能为空', trigger: 'blur' },
@@ -114,6 +114,8 @@ export default {
   },
   created () {
     this.getFollowType()
+    this.timer = new Date()
+
   },
   methods: {
     async getFollowType () {
@@ -130,8 +132,11 @@ export default {
       this.$refs.ruleForm.validate(async val => {
         if (!val) return
         this.param.sat_orderclueid = this.detailInfo.sat_orderclueid
+        console.log(this.timer)
         this.param.createdate = this.timer
-        /*this.param.createdate = `${this.timer.getFullYear()}-${this.timer.getMonth() + 1}-${this.timer.getDate()}`*/
+        console.log(this.param.createdate)
+        this.param.createdate = `${this.timer.getFullYear()}-${this.timer.getMonth() + 1}-${this.timer.getDate()} ${this.timer.getHours()}:${this.timer.getMinutes()}:${this.timer.getSeconds()}`
+        console.log(this.param.createdate)
         let res = await this.$api.requested({
           "id":20221208100602,
           "content": this.param

src/SManagement/project_target/modules/detailInfo.vue

@@ -45,10 +45,11 @@
                 v-if="actindex === scope.column.data.rowindex"
                 v-model="date"
                 type="month"
+                size="mini"
                 placeholder="选择月"
                 :picker-options="pickerOptions">
             </el-date-picker>
-            <p v-else>{{scope.column.data.year + '-' + scope.column.data.point}}</p>
+            <p v-else>{{scope.column.data.point > 10?scope.column.data.year + '-' + scope.column.data.point:scope.column.data.year + '-0' + scope.column.data.point}}</p>
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
@@ -181,10 +182,10 @@ export default {
           label:'职位',
           value:this.mainData.position
         },
-        {
+        /*{
           label:'营销区域',
           value:this.mainData.areaname
-        },
+        },*/
         {
           label:'状态',
           value:this.mainData.status
@@ -231,7 +232,11 @@ export default {
       console.log("输出")
       console.log(rowIndex)
       this.actindex = rowIndex.index + 1
-      this.date = rowIndex.year + '-' + rowIndex.point
+      if (rowIndex.point < 10){
+        this.date = rowIndex.year + '-0' + rowIndex.point
+      }else {
+        this.date = rowIndex.year + '-' + rowIndex.point
+      }
       this.saveShow = true
       this.editShow = false
     },
@@ -241,8 +246,9 @@ export default {
       console.log(this.date)
       const dateNow = new Date(this.date)
       const month = dateNow.getMonth() +1
-      const datenow = new Date()
-        if (dateNow.getFullYear() !== datenow.getFullYear()){
+     /* const datenow = new Date()*/
+      console.log(dateNow.getFullYear(),this.$route.query.year)
+      if (dateNow.getFullYear() != this.$route.query.year){
           this.open()
       }else {
         console.log(month)