销售目标页面调整

src/HDrpManagement/contractManage/components/itemClass/add.vue

@@ -221,6 +221,7 @@ export default {
   methods:{
     onShow(){
       this.dialogProductVisible = true
+     /* this.$refs.multipleTable.doLayout()*/
      /* this.listData()*/
       /*this.priceList()*/
     },
@@ -229,6 +230,7 @@ export default {
       this.list = res.data
 
       this.total = res.total
+      this.$refs.multipleTable.doLayout()
     },
     debounce (fn, wait) {
       let that = this
@@ -334,8 +336,11 @@ export default {
 
     },
     onColes(){
+      this.dialogProductVisible = false
       this.params2.content.where.condition = ''
       this.params.content.where.condition = ''
+     /* this.priceData = []
+      this.list = []*/
       this.$emit('closeDrawer')
     },
     /*已选产品数据*/
@@ -434,4 +439,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -56,7 +56,7 @@
 
 
       </div>
-      
+
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onClose">取 消</el-button>
 <!--        <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>-->
@@ -117,7 +117,7 @@ export default {
   methods: {
     selectArr (data) {
       console.log(data,data.length);
-      
+
       this.selectProductLength = data.length
     },
     addBtn () {
@@ -131,6 +131,7 @@ export default {
       this.total = res.total
       this.params.content.pageNumber = res.pageNumber
       console.log(this)
+      this.$refs.table.$refs.table.doLayout()
     },
     createTreeData (array) {
       var that = this
@@ -150,7 +151,7 @@ export default {
           istool:node['istool'],
           children: []
         }
-          
+
         if (node.subdep && node.subdep.length > 0) {
           // 如果存在子节点
           for (var index = 0; index < node.subdep.length; index++) {
@@ -192,7 +193,7 @@ export default {
           "discountrate":  item.discountrate
         }
       })
-      
+
       let res = await this.$api.requested({
         "id": 20221124110202,
         "content": {
@@ -245,6 +246,7 @@ export default {
     onClose(){
       this.drawer = false
       this.params.content.where.condition = ''
+
       this.getProductList()
       this.$emit('closeDrawer')
     },

src/HDrpManagement/contractManage/components/productClassList/productClassList.vue

@@ -15,7 +15,6 @@
         ></uploadAllData>
         <el-button class="inline-16" v-if="tool.checkAuth($route.name,'productClassManage') && data.status === '新建' && isLeader" size="small" :type="delProductData.length === 0?'':'primary'" @click="onDelProduct" :disabled="delProductData.length === 0">删 除</el-button>
         <slot name="addProduct"/>
-
       </div>
       <tableLayout checkbox="true" :layout="tablecols" :data="list" :opwidth="200" :width="false" height="400"  :custom="true" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
@@ -111,7 +110,7 @@ export default {
     },
     handleChange(num) {
       console.log(num);
-      
+
     },
     discountrateChange (val,data,index) {
       if (val > 100){
@@ -128,7 +127,7 @@ export default {
       this.form.price = num
       this.form.discountrate = Math.round((this.form.price / data.marketprice)*100 )/100
       console.log(this.form.price,data.marketprice);
-      
+
     },
     async save (data) {
       let res = await this.$api.requested({

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -26,12 +26,12 @@
             <el-input-number size="mini" v-model="scope.column.data.qty" @change="qtyChange($event,scope.column.data,scope.column.data.index)" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="描述文字" :disabled="!tool.checkAuth($route.name,'productBillManage') || data.status !== '新建' || !isLeader"></el-input-number>
           </div>
           <div v-else-if="scope.column.columnname == 'attinfos'">
-            <previewImage 
-              v-if="scope.column.data.attinfos[0]" 
-              style="width:38px;height:38px;margin:0px" 
-              class="image" 
-              :image="scope.column.data.attinfos[0]" 
-              :list="scope.column.data.attinfos" 
+            <previewImage
+              v-if="scope.column.data.attinfos[0]"
+              style="width:38px;height:38px;margin:0px"
+              class="image"
+              :image="scope.column.data.attinfos[0]"
+              :list="scope.column.data.attinfos"
               :deletebtn="false"
             ></previewImage>
           </div>
@@ -150,6 +150,7 @@ export default {
       this.totalPrice = this.tool.formatAmount(this.totalPrice,2)
       this.list = res.data
       this.total = res.total
+      this.$refs.addProduct.doLayout()
       this.$emit('priceChange')
     },
     /*修改数量*/
@@ -160,7 +161,7 @@ export default {
     },
     handleChange(num) {
       console.log(num);
-      
+
     },
     /*修改备注*/
     remarksChange (val,data,index){

src/HDrpManagement/contractManage/modules/detail.vue

@@ -1321,6 +1321,7 @@ export default {
     // this.getModelList()
   },
   created() {
+    /*this.queryMainData(this.$route.query.id)*/
   }
 }
 </script>

src/HDrpManagement/dataanalysis/components/border.vue

@@ -0,0 +1,24 @@
+<template>
+  <div :style="style"></div>
+</template>
+
+<script>
+export default {
+  name: "border",
+  data(){
+    return {
+      style:{
+        width:'100%',
+        borderRadius:'5px',
+        height:'200px',
+        border:'1px',
+        boxShadow:'0 0 10px 0 #888888'
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/dataanalysis/index.vue

@@ -1,20 +1,30 @@
 <template>
-  <normalLayout>
+<!--  <normalLayout>
     <template #content>
       <div style="padding: 20px">
         <div class="mt-10">
           <label  class="search__label" >范围:</label>
-          <el-select class="inline-24" v-model="tabName" placeholder="请选择数据分类" @change="selectChange" size="small" >
-            <el-option
-                v-for="item in editableTabs"
-                :key="item.index"
-                :label="item.templetname"
-                :value="item.templetid"
-            ></el-option>
-          </el-select>
+          <el-popover
+              placement="bottom"
+              width="180"
+              v-model="visible"
+              :stretch="true"
+              trigger="click">
+            <el-tabs v-model="activeName" @tab-click="handleClick">
+              <el-tab-pane label="部门" name="部门">
+                <el-cascader-panel ref="selectdep" :options="deplist" :props="{label:'label',value:'departmentid',children:'subdep'}"  emitPath="true" @change="selectDep"></el-cascader-panel>
+              </el-tab-pane>
+              <el-tab-pane label="人员" name="人员">
+                <el-cascader-panel ref="selectPerson" :options="personnelList" :props="{label:'name',value:'userid',children:''}"  emitPath="true" @change="selectPerson"></el-cascader-panel>
+              </el-tab-pane>
+            </el-tabs>
+            <el-input style="width: 200px" size="small" slot="reference" v-model="range" placeholder="请选择"></el-input>
+          </el-popover>
+
         </div>
         <div class="content">
           作业数据
+          <assignmentData></assignmentData>
         </div>
         <div class="content">
           销售数据
@@ -25,12 +35,93 @@
       </div>
 
     </template>
-  </normalLayout>
+  </normalLayout>-->
 </template>
 
 <script>
+import assignmentData from './modules/assignmentData'
 export default {
-  name: "index"
+  name: "index",
+  data(){
+    return {
+      activeName: '部门',
+      range:'',
+      pointValue:'',
+      visible:false,
+      deplist:[],
+      personnelList:[],
+      depmentParam:{
+        "id": 20230620102004,
+        "content": {
+        }
+      }
+    }
+  },
+  components:{
+    assignmentData
+  },
+  methods:{
+    async departmentrtment() {
+      const res = await this.$api.requested(this.depmentParam)
+      console.log(res,'部门')
+      this.deplist = this.createMenu(res.data.dep)
+      this.personnelList = res.data.hr
+    },
+    createMenu (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        // 新节点
+        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  (data) {
+      this.$refs.selectdep.getCheckedNodes(true)
+      console.log(this.$refs.selectdep.getCheckedNodes(true))
+      this.range = this.$refs.selectdep.getCheckedNodes(true)[0].label
+      this.visible = false
+    },
+    selectPerson(){
+      this.$refs.selectPerson.getCheckedNodes(true)
+      this.range = this.$refs.selectPerson.getCheckedNodes(true)[0].label
+      this.visible = false
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+
+  },
+  mounted() {
+    this.departmentrtment()
+  }
 }
 </script>
 

src/HDrpManagement/dataanalysis/modules/assignmentData.vue

@@ -0,0 +1,27 @@
+<template>
+  <div>
+    <borderTemp></borderTemp>
+  </div>
+</template>
+
+<script>
+import borderTemp from '../components/border'
+export default {
+  name: "assignmentData",
+  data() {
+    return {
+      list:'',
+      param:{
+
+      }
+    }
+  },
+  components:{
+    borderTemp
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/dispatch/details/index.vue

@@ -259,9 +259,10 @@ import defaultInfo from '../modules/defaultInfo.vue'
       }
     },
     mounted () {
-      this.queryMainData(this.$route.query.id)
+
     },
     created() {
+      this.queryMainData(this.$route.query.id)
     }
   }
   </script>

src/HDrpManagement/publicCustomer/modules/detail/detailedData.vue

@@ -150,4 +150,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/workReport/modules/reportSet/components/add.vue

@@ -22,7 +22,7 @@
               </el-row>
             </div>
             <el-row>
-              <el-col :span="24">
+              <el-col :span="12">
                 <div class="report-people" >
                   <div class="report-people_header">
                     <div class="normal-title" style="font-size:14px;margin-right:10px">汇报人员</div>
@@ -62,7 +62,7 @@
                   </el-form-item>
                 </div>
               </el-col>
-<!--              <el-col :span="12">
+              <el-col :span="12">
                 <div class="report-people" >
                   <div class="report-people_header">
                     <div class="normal-title" style="font-size:14px;margin-right:10px">汇报部门</div>
@@ -97,10 +97,8 @@
                     </el-table>
                   </el-form-item>
                 </div>
-              </el-col>-->
+              </el-col>
             </el-row>
-
-
             <div class="report-people">
               <div class="report-people_header">
                 <div class="normal-title" style="font-size:14px;margin-right:10px">汇报内容预设</div>
@@ -301,7 +299,7 @@ export default {
       })
       this.form.hrids = this.selectPeople.map(item => item.hrid)
       this.form.reporttohrids = this.selectReport.map(item => item.hrid)
-      /*this.form.departmentids = this.selectDepartment.map(item => item.departmentid)*/
+      this.form.departmentids = this.selectDepartment.map(item => item.departmentid)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         const res = await this.$api.requested({

src/HDrpManagement/workReport/modules/reportSet/components/edit.vue

@@ -22,7 +22,7 @@
               </el-row>
             </div>
             <el-row>
-              <el-col :span="24">
+              <el-col :span="12">
                 <div class="report-people">
                   <div class="report-people_header">
                     <div class="normal-title" style="font-size:14px;margin-right:10px">汇报人员</div>
@@ -74,7 +74,7 @@
                   </el-form-item>
                 </div>
               </el-col>
-<!--              <el-col :span="12">
+              <el-col :span="12">
                 <div class="report-people" >
                   <div class="report-people_header">
                     <div class="normal-title" style="font-size:14px;margin-right:10px">汇报部门</div>
@@ -109,7 +109,7 @@
                     </el-table>
                   </el-form-item>
                 </div>
-              </el-col>-->
+              </el-col>
             </el-row>
 
             <div class="report-people">
@@ -282,7 +282,7 @@ export default {
       this.getDepList()
       this.getSelectPeople()
       this.getselectOption()
-      /*this.getSelectDepartment()*/
+      this.getSelectDepartment()
     },
     async getDetail (init) {
       let res = await this.$api.requested({
@@ -439,7 +439,8 @@ export default {
       })
       this.form.hrids = res2.data.map(item => item.hrid)
       this.form.reporttohrids = this.selectReport.map(item => item.hrid)
-      /*this.form.departmentids = this.selectDepartment.map(item => item.departmentid)*/
+      console.log(this.selectDepartment,'selectDepartment')
+      this.form.departmentids = this.selectDepartment.map(item => item.departmentid)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         const res = await this.$api.requested({

src/HManagement/department/index.vue

@@ -28,12 +28,12 @@
       </template>
     </areaTree>
     <div class="hm-info-panel">
-      <basicLayout 
-        ref="basicLayout" 
+      <basicLayout
+        ref="basicLayout"
         :oldFormPath="{
           add:'HManagement/department/staff/list/modules'
         }"
-        tableName="staffTable" 
+        tableName="staffTable"
         idName="hrid"
         :detailPath="{path:'/depManage/staffDetail',param:{depid:areaInfo.departmentid}}"
         :apiId="{query:20221102090303,del:20221102090403}"
@@ -53,6 +53,9 @@
             <p v-else-if="scope.data.column.columnname === 'isleader'">
               {{scope.data.column.data.isleader == '0'?'否':'是'}}
             </p>
+            <p v-else-if="scope.data.column.columnname === 'status'">
+              {{scope.data.column.data.status == '0'?'在职':'离职'}}
+            </p>
             <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}</p>
           </div>
         </template>
@@ -116,4 +119,4 @@ export default {
   height:calc(100vh - 100px);
   overflow-y:scroll
 }
-</style>
+</style>

src/HManagement/department/staff/list/list.vue

@@ -95,4 +95,4 @@ export default {
   width: 40px;
   font-size: 14px;
 }
-</style>
+</style>

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

@@ -470,18 +470,6 @@ export default {
   },
   mounted () {
    /*this.queryData(this.year)*/
-    let that = this
-    window.addEventListener('resize', function () {
-      if (that.onBack){
-        that.onBack = false
-        that.height = 'calc(100vh - 330px)'
-        that.style.padding = '0px'
-      }else {
-        that.onBack = true
-        that.height = 'calc(100vh - 100px)'
-        that.style.padding = '10px'
-      }
-    });
     document.addEventListener('fullscreenchange', this.handleFullscreenChange);
     document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
     document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);

src/HManagement/projectTarget/target/modules/edit/components/table.vue

@@ -494,18 +494,6 @@ export default {
     }
   },
   mounted () {
-    let that = this
-   /* window.addEventListener('resize', function () {
-      if (that.onBack){
-        that.onBack = false
-        that.height = 'calc(100vh - 330px)'
-        that.style.padding = '0px'
-      }else {
-        that.onBack = true
-        that.height = 'calc(100vh - 100px)'
-        that.style.padding = '10px'
-      }
-    });*/
     document.addEventListener('fullscreenchange', this.handleFullscreenChange);
     document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
     document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);

src/HManagement/projectTarget/target/modules/edit/index.vue

@@ -166,9 +166,16 @@ export default {
       } else {
         this.errorurl = null
       }
-      this.tool.showMessage(res1,()=>{
-        this.mainData()
-      })
+      if (this.errorurl){
+        this.$message({
+          message:'导入失败请查看错误文件',
+          type:'warning'
+        })
+      }else {
+        this.tool.showMessage(res1,()=>{
+          this.mainData()
+        })
+      }
     }
   },
   mounted () {

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -9,7 +9,7 @@
         turnPageId="20221012164402"
         idname="sa_customersid"
         tags=""
-        :tabs="['详细信息','联系人信息','客户地址','开票信息','项目商机','报价单','关联合同','账户余额','银行卡信息','线索']"
+        :tabs="['详细55信息','联系人信息','客户地址','开票信息','项目商机','报价单','关联合同','账户余额','银行卡信息','线索']"
         @pageChange="pageChange"
         @onEditSuccess="onEditSuccess"
         @sysTag="sysTag">
@@ -286,7 +286,7 @@ export default {
     onSuccess(){
       this.visible = false
       this.queryMainData(this.$route.query.id)
-      /*this.$emit('onSuccess')*/
+      this.$emit('onSuccess')
     },
     statusChangeSuccess () {
       this.$refs.details.refreshTag()
@@ -311,10 +311,10 @@ export default {
     }
   },
   mounted () {
-    this.queryMainData(this.$route.query.id)
+
   },
   created() {
-
+    this.queryMainData(this.$route.query.id)
   }
 }
 </script>

src/SDrpManagement/salerPrivatecustomer/detail/index.vue

@@ -195,4 +195,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/modules/detailedData.vue

@@ -159,4 +159,4 @@ export default {
 
 .my-label {
   }
-</style>
+</style>

src/SManagement/personal_target/components/table.vue

@@ -513,7 +513,6 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      console.log(this.tableData,"++++++++++++++++++++++++++++");
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/template/addProduct/index.vue

@@ -63,7 +63,7 @@
           </el-input>
         </div>
         <div >
-          <tableTemp :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="operation">
+          <tableTemp ref="tableTemp" :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="operation">
             <template v-slot:customcol="scope">
               <p v-if="scope.column.columnname === 'cover'">
                 <previewImage v-if="scope.column.data.attinfos[0]" class="image" :image="scope.column.data.attinfos[0]" :list="scope.column.data.attinfos" :deletebtn="false"></previewImage>
@@ -159,6 +159,7 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
+      this.$refs.tableTemp.$refs.table.doLayout()
     },
     /*获取品牌*/
     async queryBrands () {
@@ -322,4 +323,4 @@ export default {
   /deep/ input::-ms-input-placeholder {
     color: #58585d;
   }
-</style>
+</style>

src/template/addProductContract/index.vue

@@ -18,7 +18,7 @@
               trigger="click"
               v-model="queryShow"
               @show="queryQuotationData">
-            <el-table :data="quotationData" @row-click="rowClick">
+            <el-table ref="tableQuotation" :data="quotationData" @row-click="rowClick">
               <el-table-column
                   prop="status"
                   label="状态"
@@ -96,7 +96,7 @@
           </el-input>
         </div>
         <div >
-          <tableTemp :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="amount,isoffer,operation">
+          <tableTemp ref="tableTemp" :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="amount,isoffer,operation">
             <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname === 'discountrate'">
                 <span v-if="scope.column.data.specialoffer === 1" style="color: red">
@@ -248,6 +248,7 @@ export default {
       const res = await this.$api.requested(this.quotationParams)
       console.log(res,'报价单')
       this.quotationData = res.data
+      this.$refs.tableQuotation.doLayout()
     },
     /*选择报价单*/
     rowClick(val){
@@ -264,6 +265,7 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
+      this.$refs.tableTemp.$refs.table.doLayout()
     },
     /*获取品牌*/
     async queryBrands () {
@@ -439,4 +441,4 @@ export default {
     position: absolute;
     left: -10px;
   }
-</style>
+</style>

src/template/addTool/index.vue

@@ -27,7 +27,7 @@
           </el-input>
         </div>
         <div >
-          <tableTemp :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="operation">
+          <tableTemp ref="table" :data="list" :layout="tablecolsAdd" :opwidth="200" :custom="true" height="calc(100vh - 370px)" @checkboxCallBack="checkboxCallBack" fixedName="operation">
             <template v-slot:customcol="scope">
               <p v-if="scope.column.columnname === 'cover'">
                 <previewImage v-if="scope.column.data.attinfos[0]" class="image" :image="scope.column.data.attinfos[0]" :list="scope.column.data.attinfos" :deletebtn="false"></previewImage>
@@ -92,6 +92,7 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
+      this.$refs.table.$refs.table.doLayout()
     },
     /*拉取数据*/
     handlePullApi (pullApi) {
@@ -170,4 +171,4 @@ export default {
   /deep/ input::-ms-input-placeholder {
     color: #58585d;
   }
-</style>
+</style>