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

src/Form/projectChange/add.vue

@@ -139,7 +139,7 @@
                     v-model="form.signdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>

src/Form/projectChange/edit.vue

@@ -146,7 +146,7 @@
                     v-model="form.signdate_due"
                     type="month"
                     placeholder="选择月份"
-                    :picker-options="pickerOptions"
+
                     @change="timeChange">
                 </el-date-picker>
               </el-form-item>

src/HDrpManagement/dataanalysis/modules/salesData.vue

@@ -13,7 +13,7 @@
             </el-row>
             <el-row :gutter="20" class="content-title">
               <el-col :span="6">
-                <span >销售金额</span>
+                <span >订单金额</span>
               </el-col>
               <el-col :span="6">
                 <span>出货金额</span>
@@ -85,7 +85,7 @@
             </el-row>
             <el-row :gutter="20" class="content-title">
               <el-col :span="6">
-                <span >销售金额</span>
+                <span >订单金额</span>
               </el-col>
               <el-col :span="6">
                 <span>出货金额</span>
@@ -157,7 +157,7 @@
             </el-row>
             <el-row :gutter="20" class="content-title">
               <el-col :span="6">
-                <span >销售金额</span>
+                <span >订单金额</span>
               </el-col>
               <el-col :span="6">
                 <span>出货金额</span>

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

@@ -105,7 +105,7 @@
                     v-model="param.content.begdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -117,7 +117,7 @@
                     v-model="param.content.enddate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>

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

@@ -105,7 +105,7 @@
                     v-model="form.begdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -117,7 +117,7 @@
                     v-model="form.enddate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>

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

@@ -80,7 +80,7 @@
                     v-model="param.content.begdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -92,7 +92,7 @@
                     v-model="param.content.enddate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>

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

@@ -83,7 +83,7 @@
                     v-model="form.begdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -95,7 +95,7 @@
                     v-model="form.enddate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -316,6 +316,10 @@ export default {
           label:'负责人',
           value:this.mainData.leader && this.mainData.leader[0].name
         },
+        {
+          label:'部门',
+          value:this.mainData.leader?this.mainData.leader[0].depname?this.mainData.leader[0].depname:'--':'--'
+        },
         {
           label:'归属经销商',
           value:this.mainData.agentname

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/toVoid.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button style="width:100%" :type="!disabled || data.erpagentnum !== '' ?'':'primary'" size="mini" block  @click="onshow" :disabled="!disabled || data.erpagentnum !== ''">作废</el-button>
+    <el-button style="width:100%" :type="!disabled || (data.isagent > 0 && data.erpagentnum !== '' && data.agentstatus === '启用') ?'':'primary'" size="mini" block  @click="onshow" :disabled="!disabled || (data.isagent > 0 && data.erpagentnum !== '' && data.agentstatus === '启用')">作废</el-button>
     <el-dialog title="" :visible.sync="dialogForm" width="25%" append-to-body>
       <div slot="title" style="font-size: 15px">
         作废

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -109,6 +109,10 @@
             </el-option>
           </el-select>
         </div>
+        <div class="mt-10">
+          <label class="search__label">部门:</label>
+          <el-cascader class="inline-16" ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>
+        </div>
         <div  class="mt-10">
           <label class="search__label" >创建时间:</label>
           <el-date-picker
@@ -167,6 +171,9 @@
         <div v-else-if="scope.data.column.columnname === 'leader'">
           <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:'--'}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'depname'">
+          <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].depname?scope.data.column.data['leader'][0].depname:'--':'--'}}</span>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
@@ -226,9 +233,17 @@ export default {
         startdate:'',
         enddate:'',
         tradingstatus:'',
-        tag:''
+        tag:'',
+        departmentid:''
 
       },
+      depmentParam:{
+        "id": 20230620102004,
+        "content": {
+        }
+      },
+      depment:'',
+      deplist:[],
       dateSelect:''
     }
   },
@@ -421,11 +436,74 @@ export default {
         },
       })
       window.open(res.data,'_self')
-    }
+    },
+    /*可选部门*/
+    async departmentrtment() {
+      const res = await this.$api.requested(this.depmentParam)
+      this.deplist = this.createMenu(res.data.dep)
+    },
+    createMenu (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        // 新节点
+        if (node.subdep.length === 0){
+          var elNode = {
+            label: node["depname"],
+            parentid:node['parentid'],
+            parentname:node['parentname'],
+            departmentid:node["departmentid"],
+            value:node["departmentid"],
+            remarks:node["remarks"],
+            isused:node["isused"],
+            changedate:node['changedate'],
+            changeby:node['changeby'],
+            createdate:node['createdate'],
+            createby:node['createby'],
+            depno:node['depno'],
+            disabled:that.pageOnlyRead,
+          }
+        }else {
+          var elNode = {
+            label: node["depname"],
+            parentid:node['parentid'],
+            parentname:node['parentname'],
+            departmentid:node["departmentid"],
+            value:node["departmentid"],
+            remarks:node["remarks"],
+            isused:node["isused"],
+            changedate:node['changedate'],
+            changeby:node['changeby'],
+            createdate:node['createdate'],
+            createby:node['createby'],
+            depno:node['depno'],
+            disabled:that.pageOnlyRead,
+            children: []
+          }
+        }
+        if (node.subdep && node.subdep.length > 0) {
+          // 如果存在子节点
+          for (var index = 0; index < node.subdep.length; index++) {
+            // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+            elNode.children.push(convertToElementTree(node.subdep[index]));
+          }
+        }
+        return elNode;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
+    },
+    selectDep(val) {
+      this.selectParam.departmentid = val[val.length -1]
+      this.selectChange()
+    },
   },
   created() {
     this.queryUserInfo()
     this.querytemplet()
+    this.departmentrtment()
   },
 }
 </script>

src/SManagement/orderclue/components/add.vue

@@ -82,7 +82,7 @@
                     v-model="param.content.begdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -94,7 +94,7 @@
                     v-model="param.content.enddate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>

src/SManagement/orderclue/components/edit.vue

@@ -82,7 +82,7 @@
                     v-model="param.begdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -94,7 +94,7 @@
                     v-model="param.enddate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -139,7 +139,6 @@
                     v-model="form.signdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
                 >
                 </el-date-picker>
               </el-form-item>

src/components/normal-basic-layout/details/modules/followUp/addLog.vue

@@ -29,6 +29,18 @@
           <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进动态" autocomplete="off"></el-input>
           </el-form-item>
+<!--          <el-form-item label="目的" prop="target" :rules="{ required: false, message: '请填写跟进目的', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" placeholder="请输入跟进目的" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="过程" prop="content" :rules="{ required: false, message: '请填写跟进过程', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进过程" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="结果" prop="results" :rules="{ required: false, message: '请填写跟进结果', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.results" placeholder="请输入跟进结果" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="下次跟进计划" prop="nextplan" :rules="{ required: false, message: '请填写下次跟进计划', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" placeholder="请输入下次跟进计划" autocomplete="off"></el-input>
+          </el-form-item>-->
           <el-form-item>
             <upload
               ref="upload"
@@ -69,7 +81,10 @@ export default {
         type:'',
         dataextend: {
           contactsid: [] // 跟进对象
-        }//扩展参数
+        },//扩展参数
+        target:'',//目的
+        results:'',//结果
+        nextplan:'',//下次跟进计划
       },
       selectTag:[],
       bindData:{},
@@ -119,6 +134,9 @@ export default {
             "ownerid":this.$route.query.id,
             "type":this.form.type,
             "content":this.form.content,
+            /*"target":this.form.target,//目的
+            "results":this.form.results,//结果
+            "nextplan":this.form.nextplan,//下次跟进计划*/
             "dataextend": {
               "contactsid": this.form.dataextend.contactsid // 跟进对象
             }

src/components/normal-basic-layout/details/modules/followUp/editLog.vue

@@ -26,9 +26,21 @@
             </el-tag>
             <contactsList style="float: left" @onSelect="onSelect" ref="listData" :selects="form.dataextend.contactsid" :sys_enterpriseid="sys_enterpriseid"></contactsList>
           </el-form-item>
-          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}">
+          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}" >
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进动态" autocomplete="off"></el-input>
           </el-form-item>
+<!--          <el-form-item label="目的" prop="target" :rules="{ required: false, message: '请填写跟进目的', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" placeholder="请输入跟进目的" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="过程" prop="content" :rules="{ required: false, message: '请填写跟进过程', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进过程" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="结果" prop="results" :rules="{ required: false, message: '请填写跟进结果', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.results" placeholder="请输入跟进结果" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="下次跟进计划" prop="nextplan" :rules="{ required: false, message: '请填写下次跟进计划', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" placeholder="请输入下次跟进计划" autocomplete="off"></el-input>
+          </el-form-item>-->
           <div class="flex-align-center flex-between pionter" v-for="file in data.attinfos" :key="file.index">
             <div class="flex-align-center">
               <img width="30" :src="checkFileType(file.postfix) === 'file'?require('@/assets/file_icons/file.svg'):file.url" class="inline-16" alt="">
@@ -115,6 +127,9 @@ export default {
             "ownerid":this.$route.query.id,
             "type":this.form.type,
             "content":this.form.content,
+           /* "target":this.form.target,//目的
+            "results":this.form.results,//结果
+            "nextplan":this.form.nextplan,//下次跟进计划*/
             "dataextend": {
               "contactsid": this.form.dataextend.contactsid // 跟进对象
             }

src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -7,7 +7,7 @@
       </div>
       <addLog :ownertable="ownertable" @onSuccess="queryLogs" :status="status"></addLog>
     </div>
-    <div  class="container scroll" >
+    <div  class="container" >
       <div v-if="logList.length === 0">
         <el-empty description="暂无记录" :image-size="40"></el-empty>
       </div>
@@ -72,8 +72,21 @@
 
                   </span>
                 </div>
+<!--                <div v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+                  <span>目的：{{i.target}}</span>
+                </div>
+                <div v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+                  <span>过程：{{i.content}}</span>
+                </div>
+                <div v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+                  <span>结果：{{i.results}}</span>
+                </div>
+                <div v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+                  <span>下次跟进计划：{{i.nextplan}}</span>
+                </div>-->
                 <div class="follow-progress">
-                  <p>{{i.content}}</p>
+                  <p >{{i.content}}</p>
+<!--                  <p v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail'">{{i.content}}</p>-->
                   <div>
                     <!-- <previewImage v-show="checkFileType(img.postfix) === 'img'" style="width:60px;height:60px;margin-left:5px" v-for="img in i.attinfos" :key="img.index" :image="img" :deletebtn="true" @onSuccess="queryLogs"></previewImage> -->
                     <div class="flex-align-center flex-between pionter" v-for="img in i.attinfos" :key="img.index" style="padding:10px;margin-bottom:5px">