代码更新

src/Form/marketing2/agent/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="onShow">新 建</el-button>
-    <el-drawer title="创建经销商" direction="rtl" size="50%" append-to-body :visible.sync="dialogVisible" @close="onClose">
+    <el-drawer title="创建经销商" direction="rtl" size="800px" append-to-body :visible.sync="dialogVisible" @close="onClose" :show-close="false">
       <div class="drawer__panel">
       <el-row :gutter="20">
         <el-form :model="form" ref="form" :rules="rules" :status-icon="false"	 size="small" label-position="right" label-width="120px" class="demo-form-inline">

src/Form/marketing2/agent/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑经销商" direction="rtl" size="50%" append-to-body :visible.sync="dialogVisible">
+    <el-drawer title="编辑经销商" direction="rtl" size="50%" append-to-body :visible.sync="dialogVisible" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" ref="form" :rules="rules" size="small" label-position="right" label-width="120px" class="demo-form-inline">

src/HDrpManagement/ProductMag/index.vue

@@ -20,6 +20,7 @@
       <template #titleRight>
         <to_examine class="inline-16" style="margin-left: 10px" :rowData="rowData" @examineSuccess="onSuccess"></to_examine>
         <counter_examine class="inline-16" :rowData="rowData" @examineSuccess="onSuccess"></counter_examine>
+        <priceLevelSetting></priceLevelSetting>
       </template>
       <template #custom>
         <div class="mt-10">
@@ -85,6 +86,7 @@ import previewImage from '@/components/previewImage/index'
 import editTemp from './modules/edit.vue'
 import to_examine from './modules/toExamine'
 import counter_examine from './modules/counterExamine'
+import priceLevelSetting from './modules/priceLevelSetting'
 
 export default {
   data () {
@@ -121,7 +123,8 @@ export default {
     previewImage,
     editTemp,
     to_examine,
-    counter_examine
+    counter_examine,
+    priceLevelSetting
   },
   methods:{
     async isOnSaleChange(val){
@@ -134,9 +137,11 @@ export default {
           "isonsale": val.isonsale//0：下架，1：上架
         },
       })
+      this.$refs.basicLayout.listData()
       this.tool.showMessage(res,()=>{
-        this.$refs.basicLayout.listData()
+
       })
+
     },
     selectChange(){
       this.$refs.basicLayout.param.content.where = this.selectParam

src/HDrpManagement/ProductMag/modules/priceLevelSetting.vue

@@ -0,0 +1,82 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="drawer = true" >价格等级设置</el-button>
+    <el-drawer
+        title="价格等级设置"
+        :visible.sync="drawer"
+        size="600px"
+        direction="rtl"
+        append-to-body
+        :show-close="false"
+        >
+      <div class="drawer__panel">
+<!--        <div style="margin-top: -10px;margin-bottom: 10px">
+          <el-button size="small" type="primary"  >添加</el-button>
+        </div>-->
+        <tableLayout :layout="tablecols" :data="list" :custom="true" height="300px" >
+          <template v-slot:customcol="scope">
+            <p >{{scope.column.data[scope.column.columnname]}}</p>
+          </template>
+          <template v-slot:opreation="scope">
+            <el-popconfirm
+                title="确定删除设置的价格等级嘛?"
+                @confirm="onDel(scope.data.sa_itemprice_grademappingid)"
+            >
+              <el-button slot="reference" type="text" size="mini">删除</el-button>
+            </el-popconfirm>
+          </template>
+        </tableLayout>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "priceLevelSetting", //价格等级设置
+  data(){
+    return {
+      drawer:false,
+      tablecols:[],
+      list:[],
+      total:0,
+      currentPage:0,
+      param:{
+        "id": 20220927143802,
+        "content": {
+        },
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+    },
+    async onDel(id){
+      const res = await this.$api.requested({
+        "id": 20220927143702,
+        "content": {
+          "sa_itemprice_grademappingids": [id]
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.listData()
+      })
+    }
+  },
+  mounted() {
+    this.listData()
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['priceLevelSettingTable'].tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/projectChange/modules/modules/andEnterprise/index.vue

@@ -4,12 +4,12 @@
       <add class="inline-16" v-if="tool.checkAuth($route.name,'andEnterpriseManage') && rowData.disabled"  :data="rowData" @addSuccess="onSuccess"></add>
       <el-input
           placeholder="请输入搜索内容"
-          suffix-icon="el-icon-search"
-          v-model="search"
+          :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'"
+          v-model="params.content.where.condition"
           style="width:200px"
           size="small"
           class="input-with-select inline-16"
-          @keyup.native.enter="queryClick"
+          @keyup.native.enter="listData(params.content.pageNumber = 1)"
           @clear="clearData"
           clearable>
       </el-input>
@@ -111,13 +111,7 @@ export default {
       this.$emit("changeSuccess")
     },
     clearData(){
-      console.log("执行")
-      this.search = ""
-      this.params.content.where.condition = this.search
-      this.listData()
-    },
-    queryClick(){
-      this.params.content.where.condition = this.search
+      this.params.content.pageNumber = 1
       this.listData()
     },
     /*获取客户类型*/

src/HManagement/archives_ad/archives_adclass/index.vue

@@ -70,10 +70,12 @@ export default {
             this.$refs.list.selectList();
         },
         openDialog(title, data) {
+          console.log(title,"title")
+            console.log(data,"data")
             this.dialogTitle = title;
             this.dialogFormVisible = true;
             if (title == '新增分类') {
-                this.form.parentid = (data) ? data.sat_sharematerial_classid : 0;
+                this.form.parentid = data? data.sat_sharematerial_classid : 0
                 this.form.sat_sharematerial_classid = 0;
                 this.form.classname = '';
 
@@ -82,8 +84,10 @@ export default {
                     this.form = { ...data, issystem: true };
                 };
             }
+            console.log(this.form,"表单数据123")
         },
         handleRequest() {
+          console.log(this.form,"表单数据")
             if (this.form.classname == '') return this.$message.error('分类名称不可为空!');
 
             this.$api.requested({

src/HManagement/archives_ad/archives_adclass/modules/list.vue

@@ -71,7 +71,7 @@ export default {
         },
         selectList() {
             this.$api.requested({
-                "id": 20221102143302,
+                "id": 20221102143202,
                 "content": {
                     parentid: 0
                 }

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

@@ -82,11 +82,16 @@
               <selectMenber @selectMenber="selectMenber"></selectMenber>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="24">
+          <el-col class="mb-30" :span="12">
             <el-form-item>
               <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
             </el-form-item>
           </el-col>
+          <el-col class="mb-30" :span="12">
+            <el-form-item>
+              <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
     </div>
@@ -184,6 +189,7 @@ export default {
         "isleader":"",
         "position":"",
         "reporthrid":"",
+        "isworker":"",
         "userid":"0"
       },
       value:[],

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

@@ -82,11 +82,16 @@
               <selectMenber @selectMenber="selectMenber"></selectMenber>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="24">
+          <el-col class="mb-30" :span="12">
             <el-form-item>
               <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
             </el-form-item>
           </el-col>
+          <el-col class="mb-30" :span="12">
+            <el-form-item>
+              <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
     </div>

src/HManagement/siteManage/securityConfig/modules/basicinfo.vue

@@ -5,6 +5,7 @@
           <el-descriptions-item label="企业名称">{{enterprise.enterprisename?enterprise.enterprisename:'--'}}</el-descriptions-item>
           <el-descriptions-item label="企业简称">{{enterprise.abbreviation}}</el-descriptions-item>
         <el-descriptions-item label="法人">{{enterprise.contact}}</el-descriptions-item>
+        <el-descriptions-item label="电话">{{enterprise.phonenumber}}</el-descriptions-item>
           <!-- <el-descriptions-item label="企业互联ID">苏州市</el-descriptions-item> -->
       </el-descriptions>
       <el-descriptions direction="vertical">

src/HManagement/siteManage/securityConfig/modules/edit.vue

@@ -32,6 +32,11 @@
                 <el-input v-model="form.contact" placeholder="法人"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="5">
+              <el-form-item label="电话:" prop="phonenumber">
+                <el-input v-model="form.phonenumber" placeholder="法人"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <div style="display:flex;align-items: center;">
                 <p class="inline-16">企业操作页LOGO：</p>

src/HManagement/siteManage/vacation/index.vue

@@ -10,6 +10,7 @@
       idName="sa_writeoffbillid" 
       :apiId="{query:20221215165504,del:20221124090304}"
       :options="options"
+      :hideSearch="true"
       :detailPath="{
         path:'/writeoffbillDetail'
       }"
@@ -18,15 +19,46 @@
       <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">
+      <template #custom>
+        <div class="mt-10">
           <p class="search__label">范围:</p>
-          <el-select v-model="isnext" style="margin-right:10px" size="small" placeholder="请选择范围" @change="areaChange">
+          <el-select v-model="isnext" style="margin-right:10px" size="small" placeholder="请选择范围" @change="areaChange" class="inline-24">
             <el-option label="今年" value="0"></el-option>
             <el-option label="明年" value="1"></el-option>
           </el-select>
         </div>
-      </div>
+        <div class="mt-10" v-if="isnext === '0'">
+          <p class="search__label">日期筛选:</p>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              v-model="dateValue"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions"
+              @change="areaChange" clearable>
+          </el-date-picker>
+        </div>
+        <div class="mt-10" v-if="isnext === '1'">
+          <p class="search__label">日期筛选:</p>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              v-model="dateValue"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions1">
+          </el-date-picker>
+        </div>
+      </template>
       <template v-slot:tbList="scope">
         <div>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
@@ -44,9 +76,27 @@ import { log } from '@antv/g2plot/lib/utils'
 export default {
   data () {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          var year = new Date().getFullYear()
+          return (
+              time.getTime() > new Date(year + '-12-31').getTime() ||
+              time.getTime() < new Date(year + '-01-01').getTime()
+          )
+        }
+      },
+      pickerOptions1: {
+        disabledDate(time) {
+          var year = new Date().getFullYear() +1
+          return (
+              time.getTime() > new Date(year + '-12-31').getTime() ||
+              time.getTime() < new Date(year + '-01-01').getTime()
+          )
+        }
+      },
       options:[],
-      isnext:'0'
-      
+      isnext:'0',
+      dateValue:[]
     }
   },
   methods:{
@@ -60,6 +110,14 @@ export default {
       param.content.isnext = 0
     },
     async areaChange () {
+      console.log(this.dateValue)
+      if (this.dateValue === '' || this.dateValue === null){
+        this.$refs.basicLayout.param.content.where.begindate = ''
+        this.$refs.basicLayout.param.content.where.enddate = ''
+      }else {
+        this.$refs.basicLayout.param.content.where.begindate = this.dateValue[0].slice(5)
+        this.$refs.basicLayout.param.content.where.enddate = this.dateValue[1].slice(5)
+      }
       this.$refs.basicLayout.param.content.isnext=this.isnext
       this.$refs.basicLayout.param.content.pageNumber=1
       this.$refs.basicLayout.listData()

src/HManagement/task/modules/add.vue

@@ -195,8 +195,8 @@ export default {
 		refresh () {
 			this.form = {
 				"sys_taskid":0,
-        "title":"任务标题",
-        "remarks":"任务说明",
+        "title":"",
+        "remarks":"",
         "starttime":"",
         "remindday":0,
         "ownertable":"",

src/components/selectAgent/agent/list.vue

@@ -7,7 +7,7 @@
       </el-input>
       <slot name="add"></slot>
     </div>
-    <tableLayout :layout="tablecols" :data="list" :custom="true" height="300px">
+    <tableLayout :layout="tablecols" :data="list" :custom="true" height="300px" >
        <template v-slot:customcol="scope">
        
         <p v-if="scope.column.columnname === 'status'">
@@ -83,7 +83,7 @@ export default {
   },
   created () {
     // 获取角色表结构
-    this.tablecols = this.tool.tabelCol(this.$route.name)['agentTable'].tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name)['superiorAgentTable'].tablecols
   }
 }
 

src/components/selectAgent/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-input v-model="value.enterprisename" readonly :placeholder="placeholder" suffix-icon="el-icon-arrow-down" autocomplete="off" @focus="onShow(dialogTableVisible=true)"></el-input>
-    <el-dialog :title="titleData" append-to-body :visible.sync="dialogTableVisible" width="80%">
+    <el-dialog :title="titleData" append-to-body :visible.sync="dialogTableVisible" width="960px">
       <div class="flex">
         <!-- 营销区域列表 -->
         <areaTree ref="arealist" style="width:200px" @onClick="onClick">

src/template/enterprise/index.vue

@@ -27,8 +27,9 @@
             width="180">
           </el-table-column>
           <el-table-column
-            prop="phone"
-            label="联系电话">
+            prop="phonenumber"
+            label="联系电话"
+            width="180">
           </el-table-column>
           <el-table-column>
             <template slot-scope="scope">