Merge branch 'ZMM_dev'

src/config/global.js

@@ -7,8 +7,8 @@
 // 后台管理系统服务器地址
 // export const baseUrl = 'http://192.168.0.14:8080'
 // export const h5BaseUrl = 'http://192.168.0.14:8091'
-// export const baseUrl = 'http://192.168.1.111:8080'
-// export const h5BaseUrl = 'http://192.168.1.111:8091'
+// export const baseUrl = 'http://192.168.0.111:8080'
+// export const h5BaseUrl = 'http://192.168.0.111:8091'
 //旧服务器
 // export const baseUrl = 'http://test.baoxianzhanggui.com:8080'  
 

src/views/FinancialManagement/InvoiceAmount.vue

@@ -241,7 +241,7 @@
               <el-select
                 v-model="editform.qualityId"
                 placeholder="请选择营业性质"
-                @change="changeDept"
+                @change="changeDept1"
               >
                 <el-option
                   v-for="item in natureBusinessList"
@@ -531,6 +531,12 @@ export default {
         if (item.value == value) {
           this.addform.qualityId = item.value;
           this.addform.qualityName = item.label;
+        }
+      });
+    },
+    changeDept1(value) {
+      this.natureBusinessList.forEach((item) => {
+        if (item.value == value) {
           this.editform.qualityName = item.label;
         }
       });
@@ -587,15 +593,14 @@ export default {
     handleChange() {},
     //新增取消重置
     resetForm(addform) {
-      this.$refs[addform].resetFields();
       this.dialogFormVisible = false;
+      this.$refs[addform].resetFields();
     },
     //修改取消重置
     reset(editform) {
-      this.$refs[editform].resetFields();
       this.dialogForm = false;
+      this.$refs[editform].resetFields();
     },
-
     //修改
     handleTableEdit(index) {
       console.log(index);

src/views/FinancialManagement/InvoiceInformation.vue

@@ -117,7 +117,7 @@
         :columns="columns"
         :showBatchDelete="true"
         :showOperation="true"
-        editButtonName="查看"
+        editButtonName="修改"
         :button1Name="button1Name"
         @handleButton1="handleTableDelete"
         @findPage="findPage"
@@ -384,20 +384,25 @@
         :rules="rules"
         ref="form"
         class="frame"
-        :disabled="pageRequest.approvalStatus == '1'"
       >
         <el-row>
           <el-col :span="12">
-            <el-form-item label="开票员" prop="invoiceClerk">
+            <el-form-item
+              label="开票员"
+              prop="invoiceClerk"
+              :disabled="pageRequest.approvalStatus == '1'"
+            >
               <el-input
                 v-model="form.invoiceClerk"
                 autocomplete="off"
+                :disabled="pageRequest.approvalStatus == '1'"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="手续费" prop="procedureFee">
               <el-input
+                :disabled="pageRequest.approvalStatus == '1'"
                 v-model="form.procedureFee"
                 autocomplete="off"
               ></el-input>
@@ -408,6 +413,7 @@
           <el-col :span="12">
             <el-form-item label="开票科目" prop="subjectsId">
               <el-select
+                :disabled="pageRequest.approvalStatus == '1'"
                 v-model="form.subjectsId"
                 placeholder="请选择开票科目"
                 @change="changeDept"
@@ -423,6 +429,7 @@
           <el-col :span="12">
             <el-form-item label="开票方" prop="invCompanyId">
               <el-select
+                :disabled="pageRequest.approvalStatus == '1'"
                 v-model="form.invCompanyId"
                 placeholder="请选择开票方"
                 @change="invCompanyChange"
@@ -441,6 +448,7 @@
           <el-col :span="12">
             <el-form-item label="对方单位名称" prop="peerCompanyName">
               <el-input
+                :disabled="pageRequest.approvalStatus == '1'"
                 v-model="form.peerCompanyName"
                 autocomplete="off"
               ></el-input>
@@ -449,6 +457,7 @@
           <el-col :span="12">
             <el-form-item label="发票号码" prop="invoiceNum">
               <el-input
+                :disabled="pageRequest.approvalStatus == '1'"
                 v-model="form.invoiceNum"
                 autocomplete="off"
               ></el-input> </el-form-item
@@ -458,6 +467,7 @@
           <el-col :span="12">
             <el-form-item label="发票数" prop="invoiceQuantity">
               <el-input-number
+                :disabled="pageRequest.approvalStatus == '1'"
                 v-model="form.invoiceQuantity"
                 @change="handleChange"
                 :min="0"
@@ -469,6 +479,7 @@
           <el-col :span="12">
             <el-form-item label="开票日期" prop="invoiceDate"
               ><el-date-picker
+                :disabled="pageRequest.approvalStatus == '1'"
                 v-model="form.invoiceDate"
                 type="date"
                 placeholder="选择日期"
@@ -482,6 +493,7 @@
           <el-col :span="12">
             <el-form-item label="不含税金额" prop="taxExclusivePrice">
               <el-input
+                :disabled="pageRequest.approvalStatus == '1'"
                 v-model="form.taxExclusivePrice"
                 autocomplete="off"
               ></el-input>
@@ -489,19 +501,28 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="税率" prop="taxRate">
-              <el-input v-model="form.taxRate" autocomplete="off"></el-input>
+              <el-input
+                v-model="form.taxRate"
+                autocomplete="off"
+                :disabled="pageRequest.approvalStatus == '1'"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="税额" prop="taxAmounts">
-              <el-input v-model="form.taxAmounts" autocomplete="off"></el-input>
+              <el-input
+                v-model="form.taxAmounts"
+                autocomplete="off"
+                :disabled="pageRequest.approvalStatus == '1'"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="开票金额" prop="invoiceAmount">
               <el-input
+                :disabled="pageRequest.approvalStatus == '1'"
                 v-model="form.invoiceAmount"
                 autocomplete="off"
               ></el-input>
@@ -514,7 +535,7 @@
               <el-select
                 v-model="form.invoiceType"
                 placeholder="请选择发票类型"
-                @change="invoiceChange"
+                @change="invoiceChange1"
               >
                 <el-option
                   v-for="item in incoiceList"
@@ -586,11 +607,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="reset('form')" size="small">取 消</el-button>
-        <el-button
-          size="small"
-          v-if="pageRequest.approvalStatus != '1'"
-          type="primary"
-          @click="determine('form')"
+        <el-button size="small" type="primary" @click="determine('form')"
           >确 定</el-button
         >
       </div>
@@ -704,7 +721,7 @@ export default {
         grossProfit: "", //毛利润
         procedureFee: "", //手续费
         remark: "", //备注
-        invCompanyId: "",
+        invCompanyId: "", //开票费id
       },
       //新增弹出框信息
       dataform: {
@@ -727,7 +744,7 @@ export default {
         grossProfit: "", //毛利润
         procedureFee: "", //手续费
         remark: "", //备注
-        invCompanyId: "",
+        invCompanyId: "", //开票方id
       },
       formLabelWidth: "120px",
       subjectstList: [], //选择的开票科目
@@ -901,12 +918,12 @@ export default {
     },
     //取消
     resetForm(dataform) {
-      this.$refs[dataform].resetFields();
       this.dialogFormVisible = false;
+      this.$refs[dataform].resetFields();
     },
     reset(form) {
-      this.$refs[form].resetFields();
       this.dialogForm = false;
+      this.$refs[form].resetFields();
     },
     //新增提交
     submitForm(dataform) {
@@ -1087,6 +1104,13 @@ export default {
         }
       });
     },
+    invoiceChange1(value) {
+      this.incoiceList.forEach((item) => {
+        if (item.value == value) {
+          this.form.invoiceType = item.label;
+        }
+      });
+    },
     //弹出框-开票方
     invCompanyChange(value) {
       this.invCompanyNameList.forEach((item) => {

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -1043,7 +1043,7 @@ export default {
           },
           delFlag: {
             name: "delFlag ",
-            value: "",
+            value: 0,
           },
         },
       },

src/views/PeopleManage/Agent/AgentManage.vue

@@ -1308,8 +1308,8 @@ export default {
       // dataFormRules: {
       //   name: [{ required: true,message: '请输入用户名',trigger: 'blur'}],
       //   deptId: [{ required: true,message: '请选择部门',trigger: 'blur'}],
-      //   // jobName: [{ required: true,message: '请选择岗位',trigger: 'blur'}],
-      //   // salarycode: [{ required: true,message: '请选择薪资等级',trigger: 'blur'}],
+      // jobName: [{ required: true,message: '请选择岗位',trigger: 'blur'}],
+      // salarycode: [{ required: true,message: '请选择薪资等级',trigger: 'blur'}],
       //   password: [{ required: true,message: '请设置初始密码',trigger: 'blur'},{ min: 6, max: 10, message: '长度在 6 到 10 个字符', trigger: 'blur' }],
       //   recommenderid:[{ required: true,message: '请选择推荐人',trigger: 'blur'}],
       //   name: [{ required: true,message: '请输入姓名',trigger: 'blur'}],
@@ -1322,14 +1322,14 @@ export default {
       //   email: [{ required: true,message: '请输入邮箱地址',trigger: 'blur'},{ type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }],
       //   addressnow: [{ required: true,message: '请输入居住地址',trigger: 'blur'}],
       //   nations: [{ required: true,message: '请选择民族',trigger: 'blur'}],
-      //   // politicalstatus: [{ required: true,message: '请选择政治面貌',trigger: 'blur'}],
-      //   // college: [{ required: true,message: '请输入毕业院校',trigger: 'blur'}],
+      // politicalstatus: [{ required: true,message: '请选择政治面貌',trigger: 'blur'}],
+      // college: [{ required: true,message: '请输入毕业院校',trigger: 'blur'}],
       //   education: [{ required: true,message: '请选择学历',trigger: 'blur'}],
-      //   // addressresident: [{ required: true,message: '请输入户口地址',trigger: 'blur'}],
-      //   // health: [{ required: true,message: '请选择健康状态',trigger: 'blur'}],
-      //   // postalcode: [{ required: true,message: '请输入邮政编码',trigger: 'blur'}],
-      //   // phonehouse: [{ required: true,message: '请输入住宅电话',trigger: 'blur'}],
-      //   // collegetm: [{ required: true,message: '请选择毕业时间',trigger: 'blur'}],
+      // addressresident: [{ required: true,message: '请输入户口地址',trigger: 'blur'}],
+      // health: [{ required: true,message: '请选择健康状态',trigger: 'blur'}],
+      // postalcode: [{ required: true,message: '请输入邮政编码',trigger: 'blur'}],
+      // phonehouse: [{ required: true,message: '请输入住宅电话',trigger: 'blur'}],
+      // collegetm: [{ required: true,message: '请选择毕业时间',trigger: 'blur'}],
       //   namespecial: [{ required: true,message: '请输入紧急联系人姓名',trigger: 'blur'}],
       //   phonespecial: [{ required: true,message: '请输入紧急联系人电话',trigger: 'blur'}],
       //   intime: [{ required: true,message: '请选择入司时间',trigger: 'blur'}],
@@ -1662,7 +1662,7 @@ export default {
               Object.assign(this.dataForm, personRes.data.sysUserInternal);
               Object.assign(this.dataForm, personRes.data.esmUserAgent);
               Object.assign(this.dataForm, params.row);
-              // this.dataForm.status = personRes.data.esmUserAgent.approvalStatus;
+              this.dataForm.status = personRes.data.esmUserAgent.approvalStatus;
               this.dataForm.status1 = personRes.data.sysUser.approvalStatus;
               this.dialogVisible = true;
             });
@@ -1672,7 +1672,7 @@ export default {
               Object.assign(this.dataForm, personRes.data.sysUserInternal);
               Object.assign(this.dataForm, personRes.data.esmUserAgent);
               Object.assign(this.dataForm, params.row);
-              // this.dataForm.status = personRes.data.sysUser.status;
+              this.dataForm.status = personRes.data.sysUser.status;
               this.dataForm.status1 = personRes.data.sysUser.approvalStatus;
               this.dialogVisible = true;
             });
@@ -2010,7 +2010,7 @@ export default {
               params.sysDept.parentName = this.deptInfo.parentName;
               params.sysDept.province = this.deptInfo.province;
 
-              // params.sysUser.approvalStatus = 1;
+              params.sysUser.approvalStatus = 0;
               params.sysUser.id = this.dataForm.id;
               params.sysUser.checkid = this.dataForm.checkid;
               params.sysUser.name = this.dataForm.name;

src/views/PeopleManage/Seo/StaffSeo.vue

@@ -766,17 +766,20 @@ export default {
             name: "mobile",
             value: "",
           },
+          delFlag: {
+            name: "delFlag ",
+            value: 0,
+          },
         },
       },
       columns: [
         // 数据列
         { prop: "deptId", label: "部门编码", minWidth: 100, sortable: false },
         {
-          prop: "companyName",
+          prop: "pdeptName",
           label: "机构名称",
           minWidth: 120,
           sortable: false,
-          formatter: this.companyNameFormatter,
         },
         { prop: "deptName", label: "部门名称", minWidth: 80, sortable: false },
         {
@@ -1113,43 +1116,43 @@ export default {
 
           if (this.pageRequest.columnFilters.approvalStatus.value == "1") {
             this.$api.user.findById(params.row.userId).then((personRes) => {
+              console.log(personRes);
               Object.assign(this.dataForm, personRes.data.sysUser);
               Object.assign(this.dataForm, personRes.data.esmUserInternal);
               Object.assign(this.dataForm, personRes.data.esmUserAgent);
-              this.dataForm.status = personRes.data.sysUser.status;
-              this.dataForm.status1 =
-                personRes.data.esmUserInternal.approvalStatus;
-              this.$api.user
-                .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
-                .then((res1) => {
-                  if (res1.code == 200) {
-                    this.dataForm.recommenderid = res1.data.id;
-                    this.dataForm.recommendername = res1.data.name;
-                  }
-                });
-
+              this.dataForm.status = personRes.data.sysUser.approvalStatus;
+              this.dataForm.status1 = personRes.data.sysUser.approvalStatus;
+              if (personRes.data.esmUserAgent != null) {
+                this.$api.user
+                  .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
+                  .then((res1) => {
+                    if (res1.code == 200) {
+                      this.dataForm.recommenderid = res1.data.id;
+                      this.dataForm.recommendername = res1.data.name;
+                    }
+                  });
+              }
               this.dialogVisible = true;
             });
           } else {
-            this.$api.user.findCheckById(params.row.id).then((personRes) => {
+            this.$api.user.findById(params.row.userId).then((personRes) => {
               console.log(personRes);
               Object.assign(this.dataForm, personRes.data.sysUser);
               Object.assign(this.dataForm, personRes.data.esmUserInternal);
               Object.assign(this.dataForm, personRes.data.esmUserAgent);
-              this.dataForm.status = personRes.data.sysUser.status;
-              this.dataForm.status1 = personRes.data.esmUserInternal.status;
-              this.dataForm.checkid = "";
-              this.$api.user
-                .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
-                .then((res1) => {
-                  console.log(res1.data);
-                  if (res1.code == 200) {
-                    this.dataForm.recommenderid = res1.data.id;
-                    this.dataForm.recommendername = res1.data.name;
-                  }
-                });
-
+              this.dataForm.status = personRes.data.sysUser.approvalStatus;
+              this.dataForm.status1 = personRes.data.sysUser.approvalStatus;
               this.dialogVisible = true;
+              if (personRes.data.esmUserAgent != null) {
+                this.$api.user
+                  .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
+                  .then((res1) => {
+                    if (res1.code == 200) {
+                      this.dataForm.recommenderid = res1.data.id;
+                      this.dataForm.recommendername = res1.data.name;
+                    }
+                  });
+              }
             });
           }
         });
@@ -1185,7 +1188,6 @@ export default {
         this.dataForm[key] = "";
       }
       this.dialogVisible = false;
-      console.log(this.dataForm);
     },
 
     // 上传图片的方法Start

src/views/PeopleManage/Seo/TeamSeo.vue

@@ -309,18 +309,28 @@
                   <el-input v-model="teamleaderid"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="8">
                 <el-form-item label="推荐人名字">
                   <el-input v-model="dataForm.recommendername"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="推荐人工号">
                   <el-input v-model="dataForm.recommenderid"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="是否显示门店">
+                  <el-input v-model="dataForm.isshowsalesroom"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="是否显示团队">
+                  <el-input v-model="dataForm.isshowteam"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
@@ -340,6 +350,11 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="录入人">
+                  <el-input v-model="dataForm.createBy"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
@@ -553,23 +568,6 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="8">
-                <el-form-item label="是否显示门店">
-                  <el-input v-model="dataForm.isshowsalesroom"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="是否显示团队">
-                  <el-input v-model="dataForm.isshowteam"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="录入人">
-                  <el-input v-model="dataForm.createBy"></el-input>
-                </el-form-item>
-              </el-col>
               <el-col :span="8">
                 <el-form-item label="录入时间">
                   <el-input v-model="dataForm.createTime"></el-input>
@@ -943,38 +941,65 @@ export default {
     handleTableEdit(params) {
       // 编辑代理人员
       this.activeTabs = "first";
-      this.$api.dept
-        .getDeptById(params.row.deptid.split("D")[0])
-        .then((deptRes) => {
-          this.deptInfo = deptRes.data;
-          this.departmentList = [];
-          for (var i = 0; i < this.ztreeNodes.length; i++) {
-            if (
-              this.ztreeNodes[i].id.indexOf(
-                params.row.deptid.split("D")[0] + "D"
-              ) >= 0
-            ) {
-              this.departmentList.push({
-                label: this.ztreeNodes[i].name,
-                value: this.ztreeNodes[i].id,
+      if (params.row.deptid != "") {
+        this.$api.dept
+          .getDeptById(params.row.deptid.split("D")[0])
+          .then((deptRes) => {
+            this.deptInfo = deptRes.data;
+            this.departmentList = [];
+            for (var i = 0; i < this.ztreeNodes.length; i++) {
+              if (
+                this.ztreeNodes[i].id.indexOf(
+                  params.row.deptid.split("D")[0] + "D"
+                ) >= 0
+              ) {
+                this.departmentList.push({
+                  label: this.ztreeNodes[i].name,
+                  value: this.ztreeNodes[i].id,
+                });
+              }
+            }
+            if (params.row.deptid != "") {
+              this.$api.user.selectByDeptId(params.row.deptid).then((res2) => {
+                console.log(res2);
+                if (res2.data != null) {
+                  if (res2.code == 200) {
+                    this.teamleaderid = res2.data.id;
+                    this.teamleadername = res2.data.name;
+                  }
+                }
               });
             }
-          }
 
-          this.$api.user.selectByDeptId(params.row.deptid).then((res2) => {
-            if (res2.code == 200) {
-              this.teamleaderid = res2.data.id;
-              this.teamleadername = res2.data.name;
-            }
-          });
+            this.$api.user.findById(params.row.id).then((personRes) => {
+              Object.assign(this.dataForm, personRes.data.sysUser);
+              Object.assign(this.dataForm, personRes.data.esmUserInternal);
+              Object.assign(this.dataForm, personRes.data.esmUserAgent);
+              this.dataForm.status = personRes.data.sysUser.status;
+              this.dataForm.status1 = personRes.data.sysUser.status;
+              if (personRes.data.esmUserAgent != null) {
+                this.$api.user
+                  .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
+                  .then((res1) => {
+                    if (res1.code == 200) {
+                      this.dataForm.recommenderid = res1.data.id;
+                      this.dataForm.recommendername = res1.data.name;
+                    }
+                  });
+              }
 
-          this.$api.user.findById(params.row.id).then((personRes) => {
-            console.log(personRes.data);
-            Object.assign(this.dataForm, personRes.data.sysUser);
-            Object.assign(this.dataForm, personRes.data.esmUserInternal);
-            Object.assign(this.dataForm, personRes.data.esmUserAgent);
-            this.dataForm.status = personRes.data.sysUser.status;
-            this.dataForm.status1 = personRes.data.esmUserInternal.status;
+              this.dialogVisible = true;
+            });
+          });
+      } else {
+        this.$api.user.findById(params.row.id).then((personRes) => {
+          console.log(personRes.data);
+          Object.assign(this.dataForm, personRes.data.sysUser);
+          Object.assign(this.dataForm, personRes.data.esmUserInternal);
+          Object.assign(this.dataForm, personRes.data.esmUserAgent);
+          this.dataForm.status = personRes.data.sysUser.status;
+          this.dataForm.status1 = personRes.data.sysUser.status;
+          if (personRes.data.esmUserAgent != null) {
             this.$api.user
               .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
               .then((res1) => {
@@ -984,10 +1009,11 @@ export default {
                   this.dataForm.recommendername = res1.data.name;
                 }
               });
+          }
 
-            this.dialogVisible = true;
-          });
+          this.dialogVisible = true;
         });
+      }
     },
     handleDialogBefore(done) {
       // 退出对话框之前确认提示
@@ -1006,7 +1032,6 @@ export default {
         this.dataForm[key] = "";
       }
       this.dialogVisible = false;
-      console.log(this.dataForm);
     },
     // 上传图片的方法Start
     beforeAvatarUpload(file) {

src/views/PeopleManage/Staff/StaffExamine.vue

@@ -1043,7 +1043,7 @@ export default {
           },
           delFlag: {
             name: "delFlag ",
-            value: "",
+            value: 0,
           },
         },
       },

src/views/PeopleManage/Staff/StaffManage.vue

@@ -1978,7 +1978,7 @@ export default {
               params.sysDept.parentName = this.deptInfo.parentName;
               params.sysDept.province = this.deptInfo.province;
 
-              // params.sysUser.approvalStatus = 1;
+              params.sysUser.approvalStatus = 0;
               params.sysUser.id = this.dataForm.id;
               params.sysUser.checkid = this.dataForm.checkid;
               params.sysUser.name = this.dataForm.name;

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -1043,7 +1043,7 @@ export default {
           },
           delFlag: {
             name: "delFlag ",
-            value: "",
+            value: 0,
           },
         },
       },