Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/writeoffbill/components/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 建</el-button>
+    <el-button size="mini" type="primary" @click="dialogFormVisible = true;form.billnodate=new Date()">新 建</el-button>
     <el-drawer title="新 建" append-to-body :visible.sync="dialogFormVisible" size="60%">
       <div slot="title" style="font-size: 15px">
         新建核销单
@@ -9,7 +9,7 @@
         <el-row>
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="企业:" prop="sys_enterpriseid">
+              <el-form-item label="经销商:" prop="sys_enterpriseid">
                 <selectEnterprise ref="ent" @rowClick="entRowClick"></selectEnterprise>
               </el-form-item>
             </el-col>
@@ -35,6 +35,16 @@
                 <el-input size="small" placeholder="请输入核销金额" v-model.number="form.writeoffamount"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="核销日期" prop="billnodate">
+                <el-date-picker
+                  v-model="form.billnodate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="订单">
                 <selectOrder v-if="dialogFormVisible" ref="table" idName="sa_orderitemsid" :layout="tablecols" :data="orderList" :custom="true" height="500px">
@@ -88,11 +98,12 @@ export default {
         "sa_accountclassid": "",
         "sa_cashbillid":"",
         "remarks":"",
-        "writeoffamount":0  //新增时可不传
+        "writeoffamount":0,  //新增时可不传
+        "billnodate": ''
       },
       rules:{
         sys_enterpriseid:[
-          { required: true, message: '请选择企业', trigger: 'blur'},
+          { required: true, message: '请选择经销商', trigger: 'blur'},
         ],
         sa_accountclassid:[
           { required: true, message: '请选择账户类型', trigger: 'blur'}
@@ -126,8 +137,6 @@ export default {
   watch: {
     dialogFormVisible (val) {
       if(!val) {
-        console.log('触发');
-        
         this.$refs.ent.form.enterprisename = ''
         this.$refs.form.resetFields()
         this.$refs.table.allArr = []
@@ -184,7 +193,7 @@ export default {
               "id": "20221124090904",
               "version":1,
               "content": {
-                sa_writeoffbillid:res.sa_writeoffbillid,
+                sa_writeoffbillid:res.data[0].sa_writeoffbillid,
                 writeoffbillOrder:result
               }
             })

src/HDrpManagement/writeoffbill/components/edit.vue

@@ -9,7 +9,7 @@
         <el-row>
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="24">
-              <el-form-item label="企业:" prop="sys_enterpriseid">
+              <el-form-item label="经销商:" prop="sys_enterpriseid">
                 <selectEnterprise ref="ent" @rowClick="entRowClick"></selectEnterprise>
               </el-form-item>
             </el-col>
@@ -35,6 +35,16 @@
                 <el-input size="small" placeholder="请输入核销金额" v-model.number="form.writeoffamount"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="核销日期" prop="billnodate">
+                <el-date-picker
+                  v-model="form.billnodate"
+                  type="date"
+                  value-format="yy-mm-dd"
+                  placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -63,11 +73,12 @@ export default {
         "sa_accountclassid": "",
         "sa_cashbillid":"",
         "remarks":"",
-        "writeoffamount":''  //新增时可不传
+        "writeoffamount":'',  //新增时可不传
+        "billnodate":''
       },
       rules:{
         sys_enterpriseid:[
-          { required: true, message: '请选择企业', trigger: 'blur'},
+          { required: true, message: '请选择经销商', trigger: 'blur'},
         ],
         sa_accountclassid:[
           { required: true, message: '请选择账户类型', trigger: 'blur'}
@@ -154,4 +165,7 @@ export default {
 .el-select {
   width: 100%;
 }
+/deep/.el-date-editor {
+  width: 100% !important;
+}
 </style>

src/HDrpManagement/writeoffbill/index.vue

@@ -14,7 +14,22 @@
         path:'/writeoffbillDetail'
       }"
       @listData="listData">
-      <div slot="custom"></div>
+      <div slot="custom">
+        <div class="label_center">
+          <span class="search__label">状态: </span>
+          <el-select
+            class="inline-16"
+            size="small"
+            v-model="status"
+            placeholder="请选择核销单状态"
+            @change="typeChange"
+            clearable
+          >
+            <el-option label="新建" value="新建"></el-option>
+            <el-option label="审核" value="审核"></el-option>
+          </el-select>
+        </div>
+      </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span style="color:#333333" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -36,7 +51,8 @@ import { log } from '@antv/g2plot/lib/utils'
 export default {
   data () {
     return {
-      options:[]
+      options:[],
+      status:''
       
     }
   },
@@ -44,6 +60,10 @@ export default {
     listData (data) {
       console.log(data);
       
+    },
+    typeChange () {
+      this.$refs.basicLayout.param.content.where.status = this.status
+      this.$refs.basicLayout.listData(this.$refs.basicLayout.param.content.pageNumber=1)
     }
   }
 }

src/HDrpManagement/writeoffbill/modules/detail.vue

@@ -100,7 +100,7 @@ export default {
           value:this.mainData.cashbillidbillno
         },
         {
-          label:'企业名称',
+          label:'经销商简称',
           value:this.mainData.enterprisename
         },
         {

src/HManagement/archives_sc/archives_scclass/modules/list.vue

@@ -125,7 +125,7 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
 .el-tag + .el-tag {
   margin-left: 10px;
 }

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

@@ -202,7 +202,7 @@ export default {
         },
         {
           label:'负责人',
-          value:this.mainData.leader ? this.mainData.leader[0].name : ''
+          value:this.mainData.leader && this.mainData.leader.length > 0 ? this.mainData.leader[0].name : ''
         },
       ]
       this.detailInfo = {
@@ -229,7 +229,7 @@ export default {
           },
           {
             label:'负责人',
-            value:this.mainData.leadername
+            value:this.mainData.leader && this.mainData.leader.length > 0 ? this.mainData.leader[0].name : ''
           },
           {
             label:'备注',

src/HManagement/siteManage/vacation/index.vue

@@ -15,6 +15,9 @@
       }"
       @listData="listData"
       @listCreate="listCreate">
+      <div slot="titleRight">
+        <el-button type="primary" size="small" @click="getVacation" style="margin-left:10px">获 取 最 新 日 期</el-button>
+      </div>
       <div slot="custom">
         <div class="label_center">
           <p class="search__label">范围:</p>
@@ -59,13 +62,18 @@ export default {
     async areaChange () {
       this.$refs.basicLayout.param.content.isnext=this.isnext
       this.$refs.basicLayout.param.content.pageNumber=1
+      this.$refs.basicLayout.listData()
+    },
+    async getVacation () {
       let res = await this.$api.requested({
         "id": 20221214094904,
         "content": {
             "isnext": this.isnext //0今年，1明年
         }
       })
-      this.$refs.basicLayout.listData()
+      this.tool.showMessage(res,() => {
+        this.$refs.basicLayout.listData()
+      })
     }
   }
 }

src/SManagement/orderclue/index.vue

@@ -137,7 +137,10 @@ export default {
         isAuth : res.data.hr.isleader,
         userid: res.data.hr.userid
       }
+      console.log(this.userInfo,'user')
       window.sessionStorage.setItem('userInfo',JSON.stringify(this.userInfo))
+      console.log(JSON.parse(window.sessionStorage.getItem('userInfo')));
+      
     },
     list (param) {
       param.content.isAll = 0