物流单，组织架构新增字段

src/Form/cashcouponPay/add.vue

@@ -314,14 +314,12 @@ export default {
     onShow(){
       this.dialogFormVisible = true
       const newData = new Date()
-      console.log(newData.getMonth())
       this.form.billdate = newData.getFullYear() + '-' + ((newData.getMonth() + 1) < 10? '0'+(newData.getMonth() + 1): (newData.getMonth() + 1)) + '-' + newData.getDate()
       this.subClassList()
     },
     /*获取分类明细*/
     subClassList(){
       this.$store.dispatch('optiontypeselect','rebatepaytype').then(res=>{
-        console.log(res,'分类明细')
         /*let index = ''
         for (var i = 0 ;i<res.data.length; i++){
           if (res.data[i].value === '返利金'){
@@ -339,7 +337,6 @@ export default {
       this.enterprise.currentPage = res.pageNumber
     },
     enterpriseData(row){
-      console.log(row,'row')
       this.form.sys_enterpriseid = row.sys_enterpriseid
       this.form.enterprisename = row.enterprisename
       this.enterpriseShow = false
@@ -363,7 +360,6 @@ export default {
       this.cashCoupon.currentPage = res.pageNumber
     },
     cashCouponData(row){
-      console.log(row)
       this.form.sa_cashbillid_billno = row.billno
       this.form.sa_cashbillid_rebate = row.sa_cashbillid
       this.cashCouponAmount = row.amount

src/Form/competitor/add.vue

@@ -134,7 +134,6 @@ export default {
     async businessSearch(){
       this.businessParam.content.keyword = this.form.enterprisename
       const res = await this.$api.requested(this.businessParam)
-      console.log(res,"工商查询结果")
       this.businessData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
@@ -142,7 +141,6 @@ export default {
     },
     /*选择工商信息*/
     businessSelect(val){
-      console.log("选择的工商信息",val)
       this.$confirm('是否以查询的工商信息更新客户信息?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/Form/competitor/edit.vue

@@ -134,7 +134,6 @@ export default {
     async businessSearch(){
       this.businessParam.content.keyword = this.form.enterprisename
       const res = await this.$api.requested(this.businessParam)
-      console.log(res,"工商查询结果")
       this.businessData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
@@ -142,7 +141,6 @@ export default {
     },
     /*选择工商信息*/
     businessSelect(val){
-      console.log("选择的工商信息",val)
       this.$confirm('是否以查询的工商信息更新客户信息?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/Form/payvoucher/edit.vue

@@ -119,11 +119,9 @@ export default {
   methods:{
     onShow(){
       this.dialogFormVisible = true
-      console.log(this.data)
       this.form = this.data
     },
     onSubmit(){
-      console.log(this.form)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         const res = await this.$api.requested({
@@ -145,7 +143,6 @@ export default {
     /*经销商列表*/
     onEnterprise(data){
       this.visibleEnterprise = false
-      console.log("企业信息",data)
       this.form.sys_enterpriseid = data.sys_enterpriseid
       this.form.enterprisename = data.enterprisename
 
@@ -164,7 +161,6 @@ export default {
           }
         }
       })
-      console.log(res)
       this.accountclass = res.data
     },
     /*分类*/
@@ -180,16 +176,11 @@ export default {
           }
         }
       })
-      console.log("支出凭证分类",res)
       this.classData = res.data
-      console.log(this.classData)
     },
     classChange(res){
-      console.log("选择",res)
-      console.log("明细",this.classData[res-1])
       this.form.class = this.classData[res-1].value
       this.subClass = this.classData[res-1].subvalues
-      console.log("form",this.form)
     }
   },
   created() {
@@ -198,7 +189,6 @@ export default {
   },
   watch:{
     "form.sys_enterpriseid":function (val){
-      console.log(val)
       this.accountList(val)
     }
   }
@@ -207,4 +197,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/ProductMag/modules/priceLevelSetting.vue

@@ -131,7 +131,6 @@ export default {
     async listData(){
       const res = await this.$api.requested(this.param)
       this.list = res.data
-      console.log(this.list)
       this.queryAgentGrade()
     },
     queryAgentGrade(){
@@ -139,7 +138,6 @@ export default {
         var t = 0
         this.agentgrade = []
         res.data.forEach((e,index)=>{
-          console.log(index)
           var flag = 0
           for (var i=0;i<this.list.length;i++){
             if (this.list[i].grade == e.value ){
@@ -151,11 +149,9 @@ export default {
           }
           if (flag === 0){
             this.agentgrade[t] = e.value
-            console.log(this.agentgrade[t])
             t = t + 1
           }
         })
-        console.log(this.agentgrade)
       })
     },
     async onDel(id){
@@ -172,7 +168,6 @@ export default {
     queryPrice(){
       this.$store.dispatch('optiontypeselect','pricegrade').then(res=>{
         this.pricegrade = res.data
-        console.log(res.data,"pricegrade")
       })
     }
   },
@@ -187,4 +182,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/logistics/details/index.vue

@@ -105,6 +105,14 @@
             label:'项目名称',
             value:this.mainData.projectName
           },
+          {
+            label:'快递公司',
+            value:this.mainData.logiscompname
+          },
+          {
+            label:'快递单号',
+            value:this.mainData.logisticno
+          },
           {
             label:'运费',
             value:this.mainData.freightamount

src/HDrpManagement/projectChange/components/auditAuthorization.vue

@@ -190,6 +190,7 @@ export default {
           message: '已取消删除'
         });
       });
+
     },
     onApproved(item){
       this.$confirm('该项目授权申请确认通过?', '提示', {

src/HDrpManagement/projectChange/components/duplicateCheck.vue

@@ -51,7 +51,6 @@ export default {
       this.param.content.address = this.data.address
       this.param.content.sa_projectid = this.data.sa_projectid || 0
       const res = await this.$api.requested(this.param)
-      console.log(res,"查重结果")
       if (res.data.length > 0){
         this.dialogTableVisible = true
         this.duplicateData = res.data
@@ -81,4 +80,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/projectChange/modules/detail.vue

@@ -52,33 +52,43 @@
         </div>-->
       </div>
     </template>
+
     <div slot="slot0" class=" normal-panel">
       <BaseInfo v-if="detailInfo" :detailInfo="detailInfo"/>
     </div>
+    <!-- 项目评估   -->
     <div slot="slot9" class=" normal-panel">
       <StageTask ref="setStage" v-if="mainData" :rowData="mainData" @estimateSuccess="$refs.details.$refs.follow.queryLogs()"/>
     </div>
+    <!-- 关联客户   -->
     <div slot="slot1" class=" normal-panel">
       <andEnterprise :rowData="mainData" v-if="flag === 1" @changeSuccess="changeSuccess"/>
     </div>
+    <!-- 联系人   -->
     <div slot="slot2" class=" normal-panel">
       <contacts v-if="mainData" :data="mainData" />
     </div>
+    <!-- 产品配置单   -->
     <div slot="slot3" class=" normal-panel" >
       <product_set :data="mainData"  v-if="flag === 1" :flagTag="flagTag" :disabled="mainData.disabled" :isLeader="isLeader"  @productSetSuccess="queryMainData($route.query.id)" @delSuccess="queryMainData($route.query.id)"/>
     </div>
+    <!-- 报价单   -->
     <div slot="slot4" class="normal-panel" >
       <quotation :data="mainData" v-if="flag === 1" :flagTag="flagTag" />
     </div>
+    <!-- 竞争对手   -->
     <div slot="slot5" class=" normal-panel">
       <Rival v-if="mainData" :data="mainData" />
     </div>
+    <!-- 合同   -->
     <div slot="slot6" class=" normal-panel">
       <contract v-if="mainData" :data="mainData" :flagTag="flagTag" />
     </div>
+    <!-- 关联线索   -->
     <div slot="slot7" class=" normal-panel">
       <clue v-if="mainData" :data="mainData" />
     </div>
+    <!-- 报备进度   -->
     <div slot="slot8" class=" normal-panel">
       <reportingProgress></reportingProgress>
     </div>

src/HManagement/department/index.vue

@@ -53,8 +53,11 @@
             <p v-else-if="scope.data.column.columnname === 'isleader'">
               {{scope.data.column.data.isleader == '0'?'否':'是'}}
             </p>
+            <p v-else-if="scope.data.column.columnname === 'issale'">
+              {{scope.data.column.data.issale == '0'?'否':'是'}}
+            </p>
             <p v-else-if="scope.data.column.columnname === 'status'">
-              {{scope.data.column.data.status == '0'?'在职':'离职'}}
+              <span :style="{color:scope.data.column.data.status == '0'?'#52c41a':''}">{{scope.data.column.data.status == '0'?'在职':'离职'}}</span>
             </p>
             <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}</p>
           </div>