E订单和CRM

src/Form/EnterpriseArchives/add.vue

@@ -1,27 +1,37 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-drawer title="新建档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible">
+    <el-drawer
+        title="新建档案"
+        direction="rtl"
+        append-to-body
+        :visible.sync="dialogFormVisible"
+        size="20%">
       <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="85px" label-position="right" size="mini">
             <el-col :span="24">
-              <el-form-item label="企业名称" prop="enterprisename">
+              <el-form-item label="企业名称:" prop="enterprisename">
                 <el-input v-model="form.enterprisename" placeholder="输入企业名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系人" prop="contact">
+            <el-col :span="24">
+              <el-form-item label="税号:" prop="taxno">
+                <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="联系人:" prop="contact">
                 <el-input v-model="form.contact" placeholder="输入企业联系人"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系电话" prop="phonenumber">
+            <el-col :span="24">
+              <el-form-item label="联系电话:" prop="phonenumber">
                 <el-input v-model="form.phonenumber" placeholder="输入联系电话"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="省市县" prop="value">
+            <el-col :span="24">
+              <el-form-item label="省市县:" prop="value">
                 <el-cascader
                   style="width:100%"
                   v-model="form.value"
@@ -30,13 +40,8 @@
                 </el-cascader>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="税号" prop="taxno">
-                <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="24">
-              <el-form-item label="详细地址" prop="address">
+              <el-form-item label="详细地址:" prop="address">
                 <el-input v-model="form.address" type="textarea" :rows="3" placeholder="输入详细地址"></el-input>
               </el-form-item>
             </el-col>
@@ -76,13 +81,13 @@ export default {
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ],
         taxno: [
-          { required: true, message: '输入税号', trigger: 'blur' },
+          { required: false, message: '输入税号', trigger: 'blur' },
         ],
         value: [
           { required: true, message: '选择省市县', trigger: 'change' },
         ],
         address:[
-          { required: true, message: '输入详细地址', trigger: 'blur' },
+          { required: false, message: '输入详细地址', trigger: 'blur' },
         ],
       }
     }

src/Form/marketing2/agent/add.vue

@@ -9,40 +9,44 @@
             <p class="normal-title normal-margin">企业信息</p>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="企业名称" prop="enterprisename">
+            <el-form-item label="企业名称:" prop="enterprisename">
               <enterprise @rowClick="chooseEnterprise"></enterprise>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="省市县">
-              <p class="enterpriseText">{{enterprise.province?enterprise.province:''}}</p>
+            <el-form-item label="省市县:">
+<!--              <p class="enterpriseText">{{enterprise.province?enterprise.province:''}}</p>-->
+              <el-input v-model="enterprise.province" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系人">
-              <p class="enterpriseText">{{enterprise.contact?enterprise.contact:''}}</p>
+            <el-form-item label="联系人:">
+              <el-input v-model="enterprise.contact" disabled></el-input>
+<!--              <p class="enterpriseText">{{enterprise.contact?enterprise.contact:''}}</p>-->
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系方式">
-              <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:''}}</p>
+            <el-form-item label="联系方式:">
+              <el-input v-model="enterprise.phonenumber" disabled></el-input>
+<!--              <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:''}}</p>-->
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="详细地址">
-              <p class="enterpriseText">{{enterprise.address?enterprise.address:''}}</p>
+            <el-form-item label="详细地址:">
+              <el-input v-model="enterprise.address" disabled></el-input>
+<!--              <p class="enterpriseText">{{enterprise.address?enterprise.address:''}}</p>-->
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <p class="normal-title normal-margin">经销商信息</p>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="经销商编号" prop="agentnum">
+            <el-form-item label="经销商编号:" prop="agentnum">
               <el-input v-model="form.agentnum" placeholder="输入经销商编号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="签约日期">
+            <el-form-item label="签约日期:">
               <el-date-picker
                 style="width:100%"
                 v-model="form.signdate"
@@ -53,7 +57,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="经销商类型" prop="type">
+            <el-form-item label="经销商类型:" prop="type">
               <el-select style="width:100%" v-model="form.type" placeholder="请选择">
                 <el-option
                   v-for="item in agent_type"
@@ -65,12 +69,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="上级经销商">
+            <el-form-item label="上级经销商:">
               <selectAgent ref="agent" @selectAgent="selectAgent"></selectAgent>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="经销商等级">
+            <el-form-item label="经销商等级:">
               <el-select style="width:100%" v-model="form.grade" placeholder="请选择">
                 <el-option
                   v-for="item in agent_level"
@@ -82,7 +86,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="营销区域" prop="sa_saleareaids">
+            <el-form-item label="营销区域:" prop="sa_saleareaids">
               <el-cascader
                 style="width:100%"
                 v-model="form.sa_saleareaids"

src/Form/marketing2/agent/edit.vue

@@ -9,7 +9,7 @@
               <p class="normal-title normal-margin">企业信息</p>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="企业名称" prop="enterprisename">
+              <el-form-item label="企业名称:" prop="enterprisename">
                 <el-popover
                   placement="bottom"
                   width="100%"
@@ -27,23 +27,27 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="省市县">
-                <p class="enterpriseText">{{enterprise.province?enterprise.province:'--'}}</p>
+              <el-form-item label="省市县:">
+                <!--              <p class="enterpriseText">{{enterprise.province?enterprise.province:''}}</p>-->
+                <el-input v-model="enterprise.province" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="联系人">
-                <p class="enterpriseText">{{enterprise.contact?enterprise.contact:'--'}}</p>
+              <el-form-item label="联系人:">
+                <el-input v-model="enterprise.contact" disabled></el-input>
+                <!--              <p class="enterpriseText">{{enterprise.contact?enterprise.contact:''}}</p>-->
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="联系方式">
-                <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:'--'}}</p>
+              <el-form-item label="联系方式:">
+                <el-input v-model="enterprise.phonenumber" disabled></el-input>
+                <!--              <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:''}}</p>-->
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="详细地址">
-                <p class="enterpriseText">{{enterprise.address?enterprise.address:'--'}}</p>
+              <el-form-item label="详细地址:">
+                <el-input v-model="enterprise.address" disabled></el-input>
+                <!--              <p class="enterpriseText">{{enterprise.address?enterprise.address:''}}</p>-->
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/Form/payvoucher/add.vue

@@ -4,13 +4,13 @@
     <el-drawer
         title="创建支出凭证"
         :visible.sync="dialogFormVisible"
-        size="35%"
+        size="25%"
         direction="rtl"
         append-to-body
         @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
+          <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="enterprisename">
                 <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>

src/Form/payvoucher/edit.vue

@@ -4,13 +4,13 @@
     <el-drawer
         title="编辑支出凭证"
         :visible.sync="dialogFormVisible"
-        size="35%"
+        size="25%"
         direction="rtl"
         append-to-body
         @close="dialogFormVisible = false">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
+          <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="enterprisename">
                 <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>
@@ -73,7 +73,7 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" 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="warning" @click="onSubmit" class="normal-btn-width">保 存</el-button>
       </div>
     </el-drawer>
     <enterprise

src/Form/recvoucher/add.vue

@@ -4,13 +4,13 @@
     <el-drawer
         title="创建收入凭证"
         :visible.sync="dialogFormVisible"
-        size="35%"
+        size="25%"
         direction="rtl"
         append-to-body
         @close="dialogFormVisible = false">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
+          <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="enterprisename">
                 <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>

src/Form/recvoucher/edit.vue

@@ -4,13 +4,13 @@
     <el-drawer
         title="编辑收入凭证"
         :visible.sync="dialogFormVisible"
-        size="35%"
+        size="25%"
         direction="rtl"
         append-to-body
         @close="dialogFormVisible = false">
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
+          <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="enterprisename">
                 <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>

src/HDrpManagement/payvoucher/index.vue

@@ -16,9 +16,8 @@
           <el-option v-for="(item,index) in accountNameList" :key="index" :value="item.accountname" :label="item.accountname"></el-option>
         </el-select>
         <label class="search__label " style="margin: auto;width: 35px;">状态:</label>
-        <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
-          <el-option :key="1" :value="0" label="新建"></el-option>
-          <el-option :key="2" :value="1" label="审核"></el-option>
+        <el-select  class="inline-24" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
+          <el-option v-for="(item,index) in statusData" :key="item.value" :value="item.value" :label="item.label"></el-option>
         </el-select>
         <label class="search__label" style="margin: auto;width: 65px;">单据日期:</label>
         <el-date-picker
@@ -60,6 +59,16 @@ export default {
           value:'审核'
         }
       ],
+      statusData:[
+        {
+          label:'新建',
+          value:'新建'
+        },
+        {
+          label:'审核',
+          value:'审核'
+        }
+      ],
       selectParam: {
         status:'',
         accountname:'',
@@ -88,11 +97,6 @@ export default {
       this.accountNameList = res.data
     },
     selectChange(){
-      if (this.selectParam.status === 0){
-        this.selectParam.status = '新建'
-      }else{
-        this.selectParam.status = '审核'
-      }
       if (this.dateSelect !== '' && this.dateSelect !== null){
         this.selectParam.begindate = this.dateSelect[0]
         this.selectParam.enddate = this.dateSelect[1]

src/HDrpManagement/recvoucher/index.vue

@@ -17,8 +17,7 @@
         </el-select>
         <label class="search__label " style="margin: auto;width: 35px;">状态:</label>
         <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
-          <el-option :key="1" :value="0" label="新建"></el-option>
-          <el-option :key="2" :value="1" label="审核"></el-option>
+          <el-option v-for="(item,index) in statusData" :key="index" :value="item.value" :label="item.value"></el-option>
         </el-select>
         <label class="search__label" style="margin: auto;width: 65px;">单据日期:</label>
         <el-date-picker
@@ -60,6 +59,16 @@ export default {
           value:'审核'
         }
       ],
+      statusData:[
+        {
+          label:'新建',
+          value:'新建'
+        },
+        {
+          label:'审核',
+          value:'审核'
+        }
+      ],
       selectParam: {
         status:'',
         accountname:'',
@@ -88,11 +97,6 @@ export default {
       this.accountNameList = res.data
     },
     selectChange(){
-      if (this.selectParam.status === 0){
-        this.selectParam.status = '新建'
-      }else{
-        this.selectParam.status = '审核'
-      }
       if (this.dateSelect !== '' && this.dateSelect !== null){
         this.selectParam.begindate = this.dateSelect[0]
         this.selectParam.enddate = this.dateSelect[1]

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

@@ -20,7 +20,7 @@
       <!-- 此区域提供了自定义操作按钮 -->
     </div>
     <div slot="slot0">
-      <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建经销商主账号</el-button>
+      <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建团队账号</el-button>
       <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="false" height="calc(100vh - 455px)"></tableLayout>
     </div>
     <div slot="slot1">
@@ -141,16 +141,31 @@ export default {
         },
       ]
     },
-    async createAgentAccount () {
-      const res = await this.$api.requested({
-        "id": 20220920084301,
-        "content": {
+    createAgentAccount () {
+      this.$confirm('是否继续创建团队账户?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        const res = await this.$api.requested({
+          "id": 20220920084301,
+          "content": {
             "sys_enterpriseid":this.mainData.sys_enterpriseid
-        }
-      })
-      this.tool.showMessage(res,()=>{
-        this.queryMainData()
-      })
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.queryMainData()
+        })
+        /*this.$message({
+          type: 'success',
+          message: '创建成功!'
+        });*/
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消创建'
+        });
+      });
     }
   },
   mounted () {

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-tooltip class="item" effect="dark" content="新增" placement="top-start">
+    <el-tooltip class="item" effect="dark" content="新增子级" placement="top-start">
       <i style="font-weight:bold" class="el-icon-plus" @click="() => append()"></i>
     </el-tooltip>
     <el-dialog title="新建区域" append-to-body width="864px" :visible.sync="dialogDepVisible" @close="onClose">

src/HManagement/marketing2/salerScope/index.vue

@@ -33,7 +33,13 @@
         :options="options">
         <div slot="custom"></div>
         <template v-slot:tbList="scope">
-          <div>
+<!--          {{scope.data.column.columnname}}-->
+          <div v-if="scope.data.column.columnname === 'isused' ">
+            <p v-if="scope.data.column.columnname.data === 1">启用</p>
+            <p v-else-if="scope.data.column.columnname.data === 0">停用</p>
+            <p v-else>--</p>
+          </div>
+          <div v-else>
             {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
           </div>
         </template>