经销商档案，新增控制是否添加营销分类

src/Form/marketing2/agent/add.vue

@@ -95,6 +95,11 @@
               <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否授权所有营销类别:" prop="isallsale" label-width="160px">
+              <el-checkbox v-model="form.isallsale" :true-label="1" :false-label="0"></el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       </div>
@@ -144,7 +149,8 @@ export default {
         ],
         "type": "",
         "erpagentnum": "",
-        "isservice": 1 //是否服务商，0或1
+        "isservice": 1, //是否服务商，0或1
+        "isallsale":1, //是否授权所有营销类别
       },
       ENlist:[],
       agent_level:[],

src/Form/marketing2/agent/edit.vue

@@ -108,6 +108,11 @@
                 <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否授权所有营销类别:" prop="isallsale" label-width="160px">
+                <el-checkbox v-model="form.isallsale" :true-label="1" :false-label="0"></el-checkbox>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>

src/HDrpManagement/collectionRule/components/add.vue

@@ -37,7 +37,7 @@
       </el-row>
       <div class="dialog-footer">
         <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width" :disabled="form.point == '' && form.amountrate == '' && form.days == '' && form.remarks == ''">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -66,20 +66,20 @@ export default {
       },
       rules:{
         point:[
-          { required: true, message: '请选择账期依据', trigger: 'change'},
+          { required: false, message: '请选择账期依据', trigger: 'change'},
         ],
         amountrate:[
-          { required: true, message: '请输入立账额度比率', trigger: 'blur'},
+          { required: false, message: '请输入立账额度比率', trigger: 'blur'},
           { validator: NumberSize , trigger:'blur'}
         ],
         days:[
-          { required: true, message: '请输入后置天数', trigger: 'blur'}
+          { required: false, message: '请输入后置天数', trigger: 'blur'}
         ],
         isdefault:[
-          { required: true, message: '请选择是否默认条件', trigger: 'blur'}
+          { required: false, message: '请选择是否默认条件', trigger: 'blur'}
         ],
         remarks:[
-          { required: true, message: '请输入描述', trigger: 'blur'}
+          { required: false, message: '请输入描述', trigger: 'blur'}
         ],
       }
     }

src/HDrpManagement/collectionRule/components/edit.vue

@@ -67,20 +67,20 @@ export default {
       },
       rules:{
         point:[
-          { required: true, message: '请选择账期依据', trigger: 'change'},
+          { required: false, message: '请选择账期依据', trigger: 'change'},
         ],
         amountrate:[
-          { required: true, message: '请输入立账额度比率', trigger: 'blur'},
+          { required: false, message: '请输入立账额度比率', trigger: 'blur'},
           { validator: NumberSize , trigger:'blur'}
         ],
         days:[
-          { required: true, message: '请输入后置天数', trigger: 'blur'}
+          { required: false, message: '请输入后置天数', trigger: 'blur'}
         ],
         isdefault:[
-          { required: true, message: '请选择是否默认条件', trigger: 'blur'}
+          { required: false, message: '请选择是否默认条件', trigger: 'blur'}
         ],
         remarks:[
-          { required: true, message: '请输入描述', trigger: 'blur'}
+          { required: false, message: '请输入描述', trigger: 'blur'}
         ],
       }
     }

src/HManagement/marketing2/agent/details/index.vue

@@ -247,6 +247,10 @@ export default {
           label:'是否订单审核可开票',
           value: this.mainData.invoicingpoint == '1' ? '订单审核' : '发货'
         },
+        {
+          label:'是否授权所有营销类别',
+          value: this.mainData.isallsale == '1' ? '是' : '否'
+        },
         {
           label:'创建人',
           value: this.mainData.createby

src/HManagement/roleManage/modules/filteringAdd.vue

@@ -36,6 +36,9 @@
                 <p>:departmentid 登陆账号的所属部门ID，缺省值为0</p>
                 <p>:subuserids 登陆账号的下级账号ID，如[1,2,3]</p>
                 <p>:subdepartmentids 登陆账号所在部门的下级部门ID，如[1,2,3]</p>
+                <p>:hrid  人员ID</p>
+                <p>:subhrids 下级人员ID</p>
+                <p>:subsys_enterpriseids 下级企业ID</p>
               </el-form-item>
             </el-col>
           </el-form>

src/SDrpManagement/toolBorrowing/detail/index.vue

@@ -73,10 +73,6 @@ export default {
           label:'单据日期',
           value:this.mainData.billdate
         },
-        {
-          label:'经销商',
-          value:this.mainData.enterprisename
-        },
         {
           label:'状态',
           value:this.mainData.status,
@@ -108,17 +104,25 @@ export default {
           }
         },
         {
-          label:'合同',
-          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+          label:'企业名称',
+          value:this.mainData.enterprisename
         },
         {
           label:'合计数量',
           value:this.mainData.qty * this.mainData.toolcount
         },
         {
-          label:'金额',
+          label:'合计金额',
           value:this.tool.formatAmount(this.mainData.amount,2)
         },
+        {
+          label:'借用合同',
+          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+        },
+        {
+          label:'审核日期',
+          value:this.mainData.checkdate
+        },
         {
           label:'收货人',
           value:this.mainData.name
@@ -127,10 +131,7 @@ export default {
           label:'收货地址',
           value:this.mainData.province + this.mainData.city + this.mainData.county + this.mainData.address
         },
-        {
-          label:'审核日期',
-          value:this.mainData.checkdate
-        },
+
         {
           label:'备注',
           value:this.mainData.remarks

src/SManagement/notice/index.vue

@@ -11,8 +11,8 @@
       :detailPath="{
         path:'/notice_detail'
       }">
-      <div slot="custom">
-        <div class="label_center">
+      <template #custom>
+        <div class="mt-10">
           <p class="search__label">板块:</p>
           <el-select
             class="inline-16"
@@ -30,7 +30,7 @@
             ></el-option>
           </el-select>
         </div>
-      </div>
+      </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'cover'">
           <el-image