2022-12-30 15:50

src/Form/marketing2/salerScope/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="query_arealist(dialogVisible = true)">新 建</el-button>
+    <el-button size="mini" type="primary" @click="query_arealist(dialogVisible = true)">新 建 管 辖 范 围</el-button>
     <el-dialog title="新建管辖区域" append-to-body :visible.sync="dialogVisible" width="400px">
       <el-cascader
         style="width:100%"

src/Form/remitvoucher/add.vue

@@ -49,7 +49,7 @@
     <el-drawer title="新建打款凭证" append-to-body :visible.sync="dialogFormVisible" size="50%">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+          <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="12">
               <el-form-item label="经销商:" prop="enterprisename">
                 <el-popover

src/Form/remitvoucher/edit.vue

@@ -49,7 +49,7 @@
     <el-drawer title="新建打款凭证" append-to-body :visible.sync="dialogFormVisible" size="30%">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+          <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="24">
               <el-form-item label="经销商:" prop="enterprisename">
                 <el-popover
@@ -72,8 +72,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item readonly label="银行:" prop="bank">
-                <el-input v-model="form.bank" placeholder="银行"></el-input>
+              <el-form-item  label="银行:" prop="bank">
+                <el-input readonly v-model="form.bank" placeholder="银行"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -166,6 +166,9 @@ export default {
         bankcardno:[
           { required: true, message: '银行编号', trigger: 'blur'},
         ],
+        amount:[
+          { required: true, message: '凭证总金额', trigger: 'blur'},
+        ],
       }
     }
   },

src/HManagement/clueManage/m_activity/modules/detailTable.vue

@@ -17,6 +17,10 @@
           <span v-if="scope.column.columnname == 'province'">
             {{scope.column.data.province}}-{{scope.column.data.city}}-{{scope.column.data.county}}
           </span>
+          <div v-else-if="scope.column.columnname == 'allocationstatus'">
+          <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '待分配'">{{scope.column.data[[scope.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '已分配'">{{scope.column.data[[scope.column.columnname]]}}</span>
+        </div>
           <div v-else-if="scope.column.columnname == 'status'">
             <span style="color:#999999" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{scope.column.data[[scope.column.columnname]]}}</span>
           <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{scope.column.data[[scope.column.columnname]]}}</span>

src/HManagement/marketing2/salerScope/area/list.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="tree-panel">
+    <div style="margin-bottom:10px;text-align:right">
+      <slot name="addArea"></slot>
+    </div>
     <el-tree
       ref="treeRef"
       :data="arealist"

src/HManagement/marketing2/salerScope/area/modules/add_area_parent.vue

@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <el-button type="primary" size="mini" @click="() => append()">新 建 营 销 区 域</el-button>
+    <el-dialog title="新建区域" append-to-body width="864px" :visible.sync="dialogDepVisible" @close="onClose">
+      <el-row :gutter="20">
+        <el-form :model="form" :rules="rules" ref="form" size="small" label-width="100px" label-position="right">
+          <el-col  :span="12">
+            <el-form-item class="item_width-full" label="区域名称" prop="areaname">
+              <el-input class="item_width-full" v-model="form.areaname" placeholder="请输入区域名称" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">  
+            <el-form-item class="item_width-full" label="区域描述" prop="remarks">
+              <el-input class="item_width-full" v-model="form.remarks" placeholder="请输入区域描述" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用">
+              <el-checkbox v-model="form.isused" :false-label="0" :true-label="1">是否启用</el-checkbox>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogDepVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      dialogDepVisible:false,
+      rules:{
+        areaname: [
+          { required: true, message: '请输入部门名称', trigger: 'blur' },
+        ],
+        remarks: [
+          { required: true, message: '请输入部门描述', trigger: 'blur' },
+        ]
+      },
+      form:{
+        "sa_saleareaid":0,
+        "areaname":"",
+        "isused":1,
+        "parentid":0,
+        "remarks":"",
+        "sequence":1
+      }
+    }
+  },
+  methods:{
+    append () {
+      this.dialogDepVisible = true
+    },
+    onSubmit () {
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid)  return false;
+        const res = await this.$api.requested({
+           "classname": "webmanage.sale.salearea.salearea",
+            "method": "insertormodify_area",
+          "content": this.form
+        })
+        if (res.code === 1)
+          this.dialogDepVisible = false
+          this.$emit('onSuccess')
+      });
+    },
+    onClose () {
+      this.$refs['form'].resetFields();
+    }
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.item_width-full{
+  width:100%
+}
+
+</style>

src/HManagement/marketing2/salerScope/index.vue

@@ -2,6 +2,7 @@
   <div class="flex">
     <!-- 营销区域列表 -->
     <areaTree ref="arealist" style="width:250px;flex:0 1 auto" @onClick="onClick">
+      <addAreaParent slot="addArea" v-if="tool.checkAuth($route.name,'addArea')" @onSuccess="onSuccess"></addAreaParent>
       <template v-slot:operation="data">
         <!-- 新增区域 -->
         <addArea v-if="tool.checkAuth($route.name,'addArea')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></addArea>
@@ -53,6 +54,7 @@
 <script>
 import areaTree from './area/list'
 import addArea from './area/modules/add_area'
+import addAreaParent from './area/modules/add_area_parent'
 import editArea from './area/modules/edit_area'
 import startArea from './area/modules/start_area'
 import delArea from './area/modules/del_area'
@@ -64,6 +66,7 @@ export default {
     editArea,
     delArea,
     startArea,
+    addAreaParent
   },
   data () {
     return {

src/HManagement/roleManage/modules/roleContent.vue

@@ -150,6 +150,8 @@ export default {
       this.options = res.data
     },
     async appoptionselect (row) {
+      this.checkAll2 = false
+      this.checkedApps = []
       this.active_systemappid = row.systemappid
       this.appoptions = row.options
       this.hiddenfields = row.hiddenfields