暂存

src/components/globalComponents/search-sort/main.vue

@@ -21,7 +21,7 @@
       :key="item.id + index"
       :label="item.search"
       :value="item.id + ''"
-      :disabled="item.status !== '1'"
+      :disabled="item.status + '' !== '1'"
     >
     </el-option>
   </el-select>
@@ -33,15 +33,7 @@ import resToken from "@/mixins/resToken";
 export default {
   name: "SearchSort",
   mixins: [resToken],
-  props: [
-    "size",
-    "value",
-    "placeholder",
-    "isDetail",
-    "disabled",
-    "names",
-    "type",
-  ],
+  props: ["size", "value", "placeholder", "isDetail", "disabled", "names", "type"],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小            非必填
@@ -85,16 +77,17 @@ export default {
   methods: {
     async selectChange(e) {
       if (e && e.length > 0) {
-        let index = this.options.findIndex((v) => v.id === e[0]);
+        let index = this.options.findIndex((v) => v.id + "" === e[0]);
         if (index !== -1) {
           let model = {
-            pid: this.options[index].item[0],
-            id: this.options[index].id,
-            code: this.options[index].id,
-            label: this.options[index].search,
+            pid: this.options[index].item[0] + "",
+            id: this.options[index].id + "",
+            code: this.options[index].id + "",
+            label: this.options[index].search + "",
             cat_desc: this.options[index].cat_desc,
-            item:this.options[index].item,
+            item: this.options[index].item + "",
           };
+          console.log(model);
           this.$emit("searchChange", model);
         } else {
           this.$emit("searchChange", {});
@@ -133,5 +126,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

src/components/globalComponents/search-unit/main.vue

@@ -17,9 +17,9 @@
   >
     <el-option
       v-for="(item, index) in options"
-      :key="item.id + index"
-      :label="item.unit"
-      :value="item.id"
+      :key="item.id + '' + index"
+      :label="item.unit + ''"
+      :value="item.id + ''"
       :disabled="item.status + '' === '0'"
     >
     </el-option>
@@ -32,15 +32,7 @@ import resToken from "@/mixins/resToken";
 export default {
   name: "SearchUnit",
   mixins: [resToken],
-  props: [
-    "size",
-    "value",
-    "placeholder",
-    "isDetail",
-    "disabled",
-    "type",
-    "names",
-  ],
+  props: ["size", "value", "placeholder", "isDetail", "disabled", "type", "names"],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小            非必填
@@ -85,12 +77,13 @@ export default {
   methods: {
     async selectChange(e) {
       if (e && e.length > 0) {
-        let index = this.options.findIndex((v) => v.id === e[0]);
+        let index = this.options.findIndex((v) => v.id + "" === e[0] + "");
+        console.log(index);
         if (index !== -1) {
           let model = {
-            id: this.options[index].id,
-            code: this.options[index].id,
-            label: this.options[index].unit,
+            id: this.options[index].id + "",
+            code: this.options[index].id + "",
+            label: this.options[index].unit + "",
           };
           this.$emit("searchChange", model);
         } else {
@@ -124,5 +117,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

src/utils/validate.js

@@ -1,3 +1,4 @@
+import * as dayjs from "dayjs";
 /**
  * Created by PanJiaChen on 16/11/18.
  */
@@ -533,6 +534,8 @@ function com2(str, arr) {
 
 //营业执照成立日期大写转小写
 export function invTime(s) {
+  s=s.replace(' 00:00:00', "")
+  //dayjs(s).format('YYYY-MM-DD')
   const option = [
     { key: "一", value: "1" },
     { key: "二", value: "2" },
@@ -551,6 +554,7 @@ export function invTime(s) {
   ].concat(option);
   const day1 = [ { key: "十", value: "10" }].concat(option);
   const day2 = [{ key: "十", value: "1" }];
+  
   let str = ["年", "月", "日"];
   let si = s.replace(/[\r\n]/g, "").replace(/\s/g, "");
   let arr1 = "",
@@ -561,7 +565,7 @@ export function invTime(s) {
   }
   let arr = si.split("-");
   if (arr.length !== 3) {
-    return "";
+    return  s;
   } else {
     arr1 = com2(arr[0], year);
     arr2 = arr[1].length > 1 ? com2(arr[1], year.concat(day2)) : com1(arr[1], day1);

src/views/goodStore/active/index.vue

@@ -2,7 +2,7 @@
   <div class="active pagePadding">
     <ex-table
       v-loading="loading"
-      v-if=" powers.some((i) => i == '001')"
+      v-if="powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -67,20 +67,12 @@
               />
             </el-col>
 
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 66px; padding: 0 0 0 10px"
-            >
+            <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
               <el-button type="primary" :size="searchSize" @click="searchList">
                 刷新
               </el-button>
             </el-col>
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 66px; padding: 0 0 0 10px"
-            >
+            <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
               <el-button type="warning" :size="searchSize" @click="restSearch">
                 重置
               </el-button>
@@ -123,8 +115,8 @@
                 >
                   <el-option label="活动名称" value="1" />
                   <el-option label="活动编码" value="2" />
-                  <el-option label="创建人" value="3" /> 
-                  <el-option label="创建人部门"  value="4"></el-option></el-select
+                  <el-option label="创建人" value="3" />
+                  <el-option label="创建人部门" value="4"></el-option></el-select
               ></el-input>
             </el-col>
             <el-col
@@ -158,14 +150,12 @@
               : 'warning'
           "
           v-text="
-            (statusOptions.find((item) => item.id == scope.row.status) || {})
-              .label || '--'
+            (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+            '--'
           "
         ></el-tag>
       </template>
-      <template #atime="{ scope }">
-        {{ scope.row.start }}~{{ scope.row.end }}
-      </template>
+      <template #atime="{ scope }"> {{ scope.row.start }}~{{ scope.row.end }} </template>
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((i) => i == '007')"
@@ -175,8 +165,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-           
-            @click="getRouter('activeDetail', scope.row.activity_code, )"
+            @click="getRouter('activeDetail', scope.row.activity_code)"
           ></i>
         </el-tooltip>
       </template>
@@ -206,9 +195,7 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "active"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "active") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
@@ -265,50 +252,49 @@ export default {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      console.log(this.parmValue)
-      const {page,size}=this.parmValue;
+      console.log(this.parmValue);
+      const { page, size } = this.parmValue;
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;
       // if(this.parmValue.brandid.length>0){
       //   this.brandid = [this.parmValue.brandid] ;
       // }
-      
-       this.pageInfo= {
+
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
       //多选条件
-    this.select = this.parmValue.select;
-    // this.sselect = this.parmValue.sselect;
-    this.sinput = this.parmValue.sinput
-
-    }else{
-       this.select = "1";
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.sinput = this.parmValue.sinput;
+    } else {
+      this.select = "1";
       //  this.sselect = "创建时间"
     }
     this.searchList();
   },
   methods: {
-    getRouter(toRouter, queryId){
+    getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
           id: queryId,
-          type: 'view',
+          type: "view",
         };
 
         //有多选框的条件
-        this.parmValue.select = this.select ;
+        this.parmValue.select = this.select;
         // this.parmValue.sselect = this.sselect ;
-        this.parmValue.sinput= this.sinput;
+        this.parmValue.sinput = this.sinput;
         //
-        console.log(this.parmValue)
-         let routerModel = {
+        console.log(this.parmValue);
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-        
+
         this.routeGoto(toRouter, model);
       } else {
         this.$message.warning("暂未找到相关流程！");
@@ -378,7 +364,7 @@ export default {
      * @param {String} status 0-禁用 1-启用
      */
     async changeStatus(id, status) {
-      await this.$confirm(`确定要改为${status + '' === "1" ? "禁用" : "启用"}？`, {
+      await this.$confirm(`确定要改为${status + "" === "1" ? "禁用" : "启用"}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -387,7 +373,7 @@ export default {
           this.loading = true;
           const model = {
             id: id,
-            status: status + '' === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1",
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
@@ -466,5 +452,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1198,7 +1198,15 @@ export default {
               is_gold_price,
               stock_moq,
               is_stock,
+              supplierNo,
+              company_id,
             } = this.ruleForm;
+            if (supplierNo.toString() === company_id) {
+              this.$message.warning("供应商不能与业务公司相同！");
+              loading = false;
+              return;
+            }
+
             if (this.is_support_stock + "" === "0" && is_stock === "0") {
               this.$message.warning("该商品为供应商退货业务创建的，不允许改为非库存品！");
               loading = false;
@@ -1960,14 +1968,16 @@ export default {
                 c.isMust = false;
               });
               spec.forEach((a, ai) => {
-                let findex = this.spec_tableData.findIndex((b) => b.spec_id === a.id);
+                let findex = this.spec_tableData.findIndex(
+                  (b) => b.spec_id + "" === a.id + ""
+                );
                 if (findex !== -1) {
                   this.spec_tableData[findex].isMust = true;
                 } else {
                   this.spec_tableData.push({
                     id: "",
                     index: "1",
-                    spec_id: a.id,
+                    spec_id: a.id + "",
                     spec_value: a.spec_name,
                     isMust: true,
                     spec_value_value: "",
@@ -1980,7 +1990,7 @@ export default {
                 let model = {
                   id: "",
                   index: "1",
-                  spec_id: a.id,
+                  spec_id: a.id + "",
                   spec_value: a.spec_name,
                   isMust: true,
                   spec_value_value: "",
@@ -2008,6 +2018,7 @@ export default {
           this.$set(this.spec_tableData, sii, si);
         });
       }
+      console.log(this.spec_tableData);
     },
     async is_goold_price_change(e) {
       await this.get_all_fee();
@@ -2026,7 +2037,7 @@ export default {
     },
     //业务企业选择
     company_idsearchChange(e) {
-      const { id, code, label } = e;
+      const { code } = e;
       this.ruleForm.company_id = code || "";
       this.$refs.ruleForm.validateField("company_id");
     },

src/views/interest/organize/addEdit.vue

@@ -25,12 +25,30 @@
             label-width="100px"
             class="demo-ruleForm"
           >
+            <el-form-item label="业务公司：" prop="companyNo">
+              <search-work-company
+                :value="ruleForm.companyNo"
+                :placeholder="'业务公司'"
+                :disabled="ruleForm.level + '' !== '1' || this.isDetail"
+                :size="searchSize"
+                :isDetail="ruleForm.level + '' !== '1' || this.isDetail"
+                @searchChange="companyNosearchChange"
+              />
+            </el-form-item>
+            <el-form-item label="上级组织：" required v-if="ruleForm.level + '' !== '1'">
+              <el-input
+                v-model="ruleForm.pname"
+                :disabled="true"
+                maxlength="50"
+                placeholder="组织名称"
+              />
+            </el-form-item>
             <el-form-item label="组织名称：" prop="name">
               <el-input
                 v-model="ruleForm.name"
                 :disabled="isDetail"
-                 maxlength="50"
-                placeholder="请输入组织名称"
+                maxlength="50"
+                placeholder="组织名称"
               />
             </el-form-item>
           </el-form>
@@ -54,16 +72,7 @@ import btnList from "@/assets/js/btnList";
 import resToken from "@/mixins/resToken";
 export default {
   mixins: [resToken],
-  props: [
-    "showModel",
-    "id",
-    "isDetail",
-    "pid",
-    "level",
-    "isAdd",
-    "type",
-    "formData",
-  ],
+  props: ["showModel", "id", "isDetail", "pid", "level", "isAdd", "type", "formData"],
   data() {
     return {
       loading: false,
@@ -74,6 +83,13 @@ export default {
       ruleForm: {},
       rulesThis: this.rules,
       rules: {
+        companyNo: [
+          {
+            required: true,
+            message: "请选择业务公司",
+            trigger: "change",
+          },
+        ],
         name: [
           {
             required: true,
@@ -104,13 +120,11 @@ export default {
     },
   },
   methods: {
-    
     async initForm() {
       if (this.isAdd) {
         this.title = "添加组织";
         this.loading = false;
         this.rulesThis = this.rules;
-       
       } else {
         if (this.isDetail) {
           this.title = "组织详情";
@@ -120,38 +134,44 @@ export default {
           this.rulesThis = this.rules;
         }
       }
-       await this.resetForm();
+      await this.resetForm();
     },
 
     async resetForm() {
-      this.ruleForm = {
-        id: this.id, 
-        pid: this.pid, 
-        name: this.formData && this.formData.name ? this.formData.name : "", // 名称
-      };
       await this.$nextTick(() => {
+        const { companyNo, name } = this.formData;
         if (this.$refs.ruleForm) {
+          this.ruleForm = {
+            id: this.id,
+            pid: this.pid,
+            companyNo: companyNo || "",
+            name: name || "", // 名称
+            level: "1",
+          };
           // 去掉验证信息
           this.$refs.ruleForm.clearValidate();
         }
       });
     },
+    async companyNosearchChange(e) {
+      const { code } = e;
+      this.ruleForm.companyNo = code || "";
+      this.$refs.ruleForm.validateField("companyNo");
+    },
     async submitForm() {
-      if (this.loading) {
-        return 
-      }
+      if (this.loading) return;
       this.loading = true;
-
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           let model = {};
           let res = {};
-          const { name } = this.ruleForm;
+          const { name, companyNo } = this.ruleForm;
 
           model = {
             id: this.id,
             pid: this.pid,
             name: name,
+            companyNo,
           };
 
           if (this.level === 1) {
@@ -177,7 +197,7 @@ export default {
           if (this.isAdd) {
             delete model["id"];
           }
-          
+
           if (this.isAdd) {
             res = await asyncRequest.add(model);
           } else {

src/views/interest/organize/index.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="organize pagePadding">
-    <div
-      v-loading="loading"
-      v-if=" powers.some((i) => i == '001')"
-    >
+    <div v-loading="loading" v-if="powers.some((i) => i == '001')">
       <el-row>
         <el-col :span="24">
           <el-col :span="24" style="padding: 12px 0 15px 0">
@@ -16,9 +13,7 @@
                 @click="changeBreadcrumb(index)"
               >
                 <span class="label">{{ item.titleName }}</span
-                ><span class="separator" v-if="index + 1 !== titleList.length"
-                  >/</span
-                >
+                ><span class="separator" v-if="index + 1 !== titleList.length">/</span>
               </div>
             </div>
           </el-col>
@@ -28,7 +23,7 @@
                 <el-input
                   placeholder="部门名称"
                   :size="searchSize"
-                   maxlength="50"
+                  maxlength="50"
                   v-model="parmValue.name"
                 >
                 </el-input>
@@ -37,7 +32,7 @@
                 <el-input
                   placeholder="员工姓名"
                   :size="searchSize"
-                   maxlength="50"
+                  maxlength="50"
                   v-model="parmValue.nickname"
                 >
                   <el-button
@@ -82,14 +77,9 @@
           </el-col>
         </el-col>
       </el-row>
-
+      <!-- && this.currentCompany -->
       <el-row :gutter="10">
-        <el-col
-          :span="24"
-          v-if="
-             powers.some((i) => i == '001') && this.currentCompany
-          "
-        >
+        <el-col :span="24" v-if="powers.some((i) => i == '001')">
           <organize-tree
             style="margin-left: -5px"
             :list="depart"
@@ -109,16 +99,17 @@
           />
         </el-col>
 
-        <div
-          class="no-data"
-          v-else-if="!this.currentCompany"
-        >
-          请选择一家公司
-        </div>
+        <!-- <div class="no-data" v-else-if="!this.currentCompany">请选择一家公司</div> -->
 
         <div
           class="no-data"
-          v-if="item && item.length === 0 && depart && depart.length === 0 && this.currentCompany"
+          v-if="
+            item &&
+            item.length === 0 &&
+            depart &&
+            depart.length === 0 &&
+            this.currentCompany
+          "
         >
           暂无数据
         </div>
@@ -146,16 +137,17 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import asyncRequest from "@/apis/service/interest/organize";
 import addEdit from "./addEdit";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
-import companyHelper from "@/mixins/companyHelper"
+// import companyHelper from "@/mixins/companyHelper"
 export default {
   name: "organize",
   components: {
     addEdit,
   },
-  mixins: [mixinPage, resToken,companyHelper],
+  //,companyHelper
+  mixins: [mixinPage, resToken],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
@@ -184,7 +176,7 @@ export default {
         name: "", // 部门/公司名称
         nickname: "", // 员工名称
       },
-      depart: [],
+      depart: [{ id: 1, level: "1", name: "测试", companyNo: "QS2203150147013805" }],
       item: [],
       passwordModel: false,
       passwordModelId: 0,
@@ -204,12 +196,12 @@ export default {
       };
       this.searchList();
     },
-    onCompanyChange(){
-      this.parmValue.pid = ""
-      this.titleList = []
-      this.depart = []
-      this.item = []
-      this.searchList()
+    onCompanyChange() {
+      this.parmValue.pid = "";
+      this.titleList = [];
+      this.depart = [];
+      this.item = [];
+      this.searchList();
     },
     // 原来
     // async changeBreadcrumb(index) {
@@ -254,7 +246,7 @@ export default {
         titleName: item.name,
       };
       if (this.titleList.length === 0) {
-        this.titleList.push({ id: "", titleName: "全部分类" });
+        this.titleList.push({ id: "", titleName: "全部组织" });
       }
       this.titleList.push(model);
       await this.searchList();
@@ -293,7 +285,7 @@ export default {
       }
     },
     addEditFn(id, pid, level, isDetail, isAdd, formData) {
-      if(!this.isHasCurrentCompany()) return
+      // if (!this.isHasCurrentCompany()) return;
       this.showModel = true;
       this.modelId = id;
       this.level = level;
@@ -307,7 +299,7 @@ export default {
       console.log(
         `openChildren-id, parentIds, level:${id}-${parentIds}-${level}-${status}`
       );
-      await this.$confirm(`确定要${status + '' === "0" ? "启用" : "禁用"}？`, {
+      await this.$confirm(`确定要${status + "" === "0" ? "启用" : "禁用"}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -315,7 +307,7 @@ export default {
         .then(async () => {
           const model = {
             id: id,
-            status: status + '' === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1",
           };
           let res = await asyncRequest.status(model);
 
@@ -398,7 +390,7 @@ export default {
         .then(async () => {
           const model = {
             id: id,
-            status: status + '' === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1",
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
@@ -418,17 +410,18 @@ export default {
         });
     },
     async searchList() {
-      if(!this.currentCompany){
-        this.$message.warning("请选择一家公司")
-        this.parmValue.pid = ""
-        this.titleList = []
-        this.depart = []
-        this.item = []
-        return 
-      }
-
+      // if (!this.currentCompany) {
+      //   this.$message.warning("请选择一家公司");
+      //   this.parmValue.pid = "";
+      //   this.titleList = [];
+      //   this.depart = [];
+      //   this.item = [];
+      //   return;
+      // }
+      if (!this.loading) return;
+      return;
       this.loading = true;
-      this.parmValue.companyNo = this.currentCompany
+      // this.parmValue.companyNo = this.currentCompany;
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         const { depart, item } = res.data;
@@ -443,7 +436,7 @@ export default {
       this.loading = false;
     },
     async statusConfirm(id, status) {
-      await this.$confirm(`确定要改为${status + '' === "1" ? "禁用" : "启用"}？`, {
+      await this.$confirm(`确定要改为${status + "" === "1" ? "禁用" : "启用"}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -452,7 +445,7 @@ export default {
           this.loading = true;
           const model = {
             id: id,
-            status: status + '' === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1",
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
@@ -475,7 +468,7 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .organize {
   .no-data {
     padding: 25px 0;

src/views/serviceParam/supplier/components/addEdit.vue

@@ -36,7 +36,7 @@
               <el-col :span="23" style="border-left: 1px solid #dcdfe6">
                 <el-row>
                   <el-col :span="4">
-                    <el-form-item label="法人" prop="inv_legaler">
+                    <el-form-item label="法人" required>
                       {{ ruleForm.inv_legaler }}</el-form-item
                     ></el-col
                   >
@@ -60,7 +60,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="16">
-                    <el-form-item label="企业名称" prop="company">
+                    <el-form-item label="企业名称" required>
                       {{ ruleForm.company }}
                     </el-form-item>
                   </el-col>
@@ -70,7 +70,7 @@
                       <el-col :span="8"
                         ><el-form-item
                           label="纳税识别号"
-                          prop="inv_code"
+                          required
                           label-width="100px"
                           style="width: 100%"
                         >
@@ -78,13 +78,13 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="7">
-                        <el-form-item label="成立日期" prop="inv_time">
+                        <el-form-item label="成立日期" required>
                           {{ ruleForm.inv_time }}
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="9">
-                        <el-form-item label="公司类型" prop="type">
+                        <el-form-item label="公司类型" required>
                           {{ ruleForm.type }}</el-form-item
                         ></el-col
                       >
@@ -92,18 +92,18 @@
                   </el-col>
 
                   <el-col :span="18">
-                    <el-form-item label="详细地址" prop="inv_addr">
-                      {{ ruleForm.inv_addr }}
+                    <el-form-item label="详细地址" required>
+                      {{ ruleForm.addr }}
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
-                    <el-form-item label="联系人" prop="contactor">
+                    <el-form-item label="联系人" required>
                       {{ ruleForm.contactor }}
                     </el-form-item></el-col
                   >
 
                   <el-col :span="24">
-                    <el-form-item label="营业范围" prop="inv_scope">
+                    <el-form-item label="营业范围" required>
                       {{ ruleForm.inv_scope }}
                     </el-form-item>
                   </el-col>
@@ -147,9 +147,9 @@
                   </el-col>
 
                   <el-col :span="13">
-                    <el-form-item size="medium" label="联系地址" prop="addr">
+                    <el-form-item size="medium" label="联系地址" prop="inv_addr">
                       <el-input
-                        v-model="ruleForm.addr"
+                        v-model="ruleForm.inv_addr"
                         placeholder="联系地址"
                         maxlength="100"
                         :disabled="isDetail == '007'"
@@ -190,33 +190,12 @@
 <script>
 import asyncRequest from "@/apis/service/serviceParam/supplier";
 import resToken from "@/mixins/resToken";
-import {
-  isMobile,
-  isLicense,
-  isPhone,
-  isChinese,
-  isEmoticon,
-  isSpecialSymbol,
-  hasSpace,
-  isAddr,
-  invTime,
-} from "@/utils/validate";
+import { isMobile, isPhone, invTime } from "@/utils/validate";
 export default {
   name: "workCompany",
   props: ["showModel", "id", "sitem", "isDetail"],
   mixins: [resToken],
   data() {
-    const validateLicense = (rule, value, callback) => {
-      if (value !== "") {
-        if (!isLicense(value)) {
-          callback(new Error("纳税识别号不正确！"));
-        } else {
-          callback();
-        }
-      } else {
-        callback(new Error("纳税识别号不能为空！"));
-      }
-    };
     const validatemobile = (rule, value, callback) => {
       if (value !== "") {
         if (isPhone(value) || isMobile(value)) {
@@ -228,47 +207,7 @@ export default {
         callback(new Error("联系电话不能为空！"));
       }
     };
-    const validatename = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("法人不能为空！"));
-      } else {
-        if (!isChinese(value)) {
-          callback(new Error("法人只能为汉字！"));
-        } else if (isEmoticon(value)) {
-          callback(new Error("法人只能为汉字！"));
-        } else {
-          callback();
-        }
-      }
-    };
-    const validatecontactor = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("联系人不能为空！"));
-      } else {
-        if (!isChinese(value)) {
-          callback(new Error("联系人只能为汉字！"));
-        } else if (isEmoticon(value)) {
-          callback(new Error("联系人只能为汉字！"));
-        } else {
-          callback();
-        }
-      }
-    };
-    const validateAddr = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("详细地址不能为空！"));
-      } else {
-        if (hasSpace(value)) {
-          callback(new Error("不能出现/回车/换行符！"));
-        } else if (isSpecialSymbol(value)) {
-          callback(new Error("不能使用英文特殊字符！"));
-        } else if (isAddr(value)) {
-          callback();
-        } else {
-          callback(new Error("详细地址填写不规范！"));
-        }
-      }
-    };
+
     return {
       pickerOptions: {
         disabledDate(time) {
@@ -299,43 +238,6 @@ export default {
       },
       rulesThis: this.rules,
       rules: {
-        company: [{ required: true, message: "企业名称不能为空!", trigger: "blur" }],
-        type: [
-          {
-            required: true,
-            message: "公司类型不能为空！",
-            trigger: "change",
-          },
-        ],
-        inv_code: [
-          {
-            required: true,
-            validator: validateLicense,
-            trigger: "blur",
-          },
-        ],
-        inv_legaler: [
-          {
-            required: true,
-            validator: validatename,
-            trigger: "blur",
-          },
-        ],
-
-        inv_time: [
-          {
-            required: true,
-            message: "成立日期不能为空！",
-            trigger: "change",
-          },
-        ],
-        inv_addr: [
-          {
-            required: true,
-            validator: validateAddr,
-            trigger: "blur",
-          },
-        ],
         inv_bank: [
           {
             required: true,
@@ -350,13 +252,7 @@ export default {
             trigger: "blur",
           },
         ],
-        contactor: [
-          {
-            required: true,
-            validator: validatecontactor,
-            trigger: "blur",
-          },
-        ],
+
         mobile: [
           {
             required: true,
@@ -364,15 +260,7 @@ export default {
             trigger: "blur",
           },
         ],
-        addr: [{ required: true, message: "联系地址不能为空！", trigger: "blur" }],
-        inv_scope: [{ required: true, message: "经营范围不能为空！", trigger: "blur" }],
-        license_img: [
-          {
-            required: false,
-            message: "",
-            trigger: "blur",
-          },
-        ],
+        inv_addr: [{ required: true, message: "联系地址不能为空！", trigger: "blur" }],
       },
     };
   },
@@ -424,12 +312,12 @@ export default {
           inv_code: registercode || "", //	纳税识别号
           inv_legaler: legaler || "", //	法人
           inv_time: invTime(registertime) || "", //注册日期
-          inv_addr: addr || "", //注册地址
+          inv_addr: "", //注册地址
           inv_bank: "", //	银行
           inv_bankNo: "", //	银行账户
           contactor: contactor || "", //		联系人
           mobile: "", //	联系人电话
-          addr: "", //		联系地址
+          addr: addr || "", //		联系地址
           inv_scope: scope || "", //	经营范围
           license_img: license_img || "", //	营业执照
         };
@@ -472,13 +360,13 @@ export default {
             return;
           }
           this.loading = true;
-          const { code, inv_bank, inv_bankNo, addr, mobile } = this.ruleForm;
+          const { code, inv_bank, inv_bankNo, inv_addr, mobile } = this.ruleForm;
 
           const model = {
             code,
             inv_bank,
             inv_bankNo,
-            addr,
+            inv_addr,
             mobile,
           };
 

src/views/serviceParam/supplier/index.vue

@@ -189,6 +189,18 @@
           "
         ></el-tag>
       </template>
+      <template #is_upgrade="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.is_upgrade + '' === '1' ? 'success' : ''"
+          v-text="
+            (
+              is_upgrade_options.find((item) => item.id == scope.row.is_upgrade + '') ||
+              {}
+            ).label || '--'
+          "
+        ></el-tag>
+      </template>
 
       <template #operation="{ scope }">
         <el-tooltip
@@ -232,15 +244,20 @@
             @click="changeStatus(scope.row.id, scope.row.status)"
           ></i>
         </el-tooltip>
-        <!-- <el-tooltip
+        <el-tooltip
           v-if="powers.some((i) => i == '006')"
           effect="dark"
           content="删除"
           placement="top"
         >
           <i class="el-icon-delete tb-icon" @click="deleteItem(scope.row.id)"></i>
-        </el-tooltip> -->
-        <el-tooltip effect="dark" content="升级为业务公司" placement="top">
+        </el-tooltip>
+        <el-tooltip
+          effect="dark"
+          content="升级"
+          placement="top"
+          v-if="scope.row.is_upgrade + '' === '0'"
+        >
           <i class="el-icon-top tb-icon" @click="openModal(scope.row)"></i>
         </el-tooltip>
       </template>
@@ -289,6 +306,10 @@ export default {
       modelId: "",
       modelSitem: null,
       stype: {},
+      is_upgrade_options: [
+        { id: "1", label: "已升级" },
+        { id: "0", label: "未升级" },
+      ],
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
@@ -345,10 +366,15 @@ export default {
         {
           prop: "ocr_status",
           label: "营业执照识别状态",
-          minWidth: "120",
+          width: "120",
           _slot_: "ocr_status",
         },
-
+        {
+          prop: "is_upgrade",
+          label: "是否升级为业务公司",
+          width: "130",
+          _slot_: "is_upgrade",
+        },
         {
           prop: "legaler",
           label: "法人",
@@ -378,7 +404,7 @@ export default {
           prop: "",
           label: "操作",
           fixed: "right",
-          width: "160",
+          width: "170",
           _noset_: true,
           _slot_: "operation",
         },

src/views/serviceParam/workCompany/addEdit.vue

@@ -25,8 +25,8 @@
             label-width="90px"
             class="demo-ruleForm"
           >
-            <el-row style="">
-              <el-col :span="1" style="height: 336px; border-right: 1px solid #dcdfe6">
+            <el-row>
+              <el-col :span="1" style="padding: 20px 0 0 0">
                 <ul class="tc fff">
                   <li>企</li>
                   <li>业</li>
@@ -34,142 +34,80 @@
                   <li>息</li>
                 </ul>
               </el-col>
-              <el-col :span="23">
+              <el-col :span="23" style="border-left: 1px solid #dcdfe6">
                 <el-row>
-                  <el-col :span="13">
-                    <el-form-item label="企业名称" prop="company">
-                      <el-input
-                        placeholder="企业名称"
-                        filterable
-                        :disabled="isDetail == '007'"
-                        maxlength="100"
-                        clearable
-                        v-model="ruleForm.company"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="11"
-                    ><el-form-item
-                      label="统一社会信用代码"
-                      prop="inv_code"
-                      label-width="150px"
-                      style="width: 100%"
-                    >
-                      <el-input
-                        placeholder="统一社会信用代码"
-                        filterable
-                        :disabled="isDetail == '007'"
-                        maxlength="40"
-                        clearable
-                        v-model="ruleForm.inv_code"
-                      />
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="13">
-                    <el-form-item label="详细地址" prop="inv_addr">
-                      <el-input
-                        placeholder="详细地址"
-                        v-model="ruleForm.inv_addr"
-                        maxlength="100"
-                        clearable
-                        :disabled="isDetail == '007'"
-                      >
-                      </el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="11">
-                    <el-form-item label="法人" prop="inv_legaler">
-                      <el-input
-                        placeholder="法人"
-                        v-model="ruleForm.inv_legaler"
-                        maxlength="12"
-                        minlength="2"
-                        clearable
-                        :disabled="isDetail == '007'"
-                      /> </el-form-item
-                  ></el-col>
-                  <el-col :span="13">
-                    <el-form-item label="成立日期" prop="inv_time">
-                      <el-date-picker
-                        style="width: 100%"
-                        v-model="ruleForm.inv_time"
-                        align="right"
-                        type="date"
-                        placeholder="成立日期"
-                        value-format="yyyy-MM-dd"
-                        :picker-options="pickerOptions"
-                      >
-                      </el-date-picker>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="11">
-                    <el-form-item label="联系人" prop="contactor">
-                      <el-input
-                        placeholder="联系人"
-                        v-model="ruleForm.contactor"
-                        maxlength="12"
-                        minlength="2"
-                        clearable
-                        :disabled="isDetail == '007'"
-                      /> </el-form-item
-                  ></el-col>
-                  <el-col :span="13">
-                    <el-form-item label="营业范围" prop="inv_scope">
-                      <el-input
-                        v-model="ruleForm.inv_scope"
-                        type="textarea"
-                        placeholder="营业范围"
-                        maxlength="2000"
-                        :rows="8"
-                        show-word-limit
-                        :disabled="isDetail == '007'"
-                      />
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="11">
-                    <el-form-item label="公司类型" prop="type">
-                      <search-company-type
-                        :value="ruleForm.type"
-                        :disabled="false"
-                        :size="'mini'"
-                        :isDetail="false"
-                        :placeholder="'公司类型'"
-                        @searchChange="type_search_change"
-                      /> </el-form-item
-                  ></el-col>
-
-                  <el-col :span="11" style="height: 124px">
+                  <el-col :span="4">
+                    <el-form-item label="法人" required>
+                      {{ ruleForm.inv_legaler }}</el-form-item
+                    ></el-col
+                  >
+                  <el-col :span="4">
                     <el-form-item
                       label="营业执照"
                       prop="license_img"
                       class="activity-upload"
                     >
-                      <div class="btnupload" style="position: relative">
+                      <div
+                        class="btnupload"
+                        style="position: relative; width: 28px; height: 28px"
+                      >
                         <img
                           v-if="ruleForm.license_img"
                           :src="ruleForm.license_img"
+                          v-viewer
                           class="avatar"
                         />
-                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                        <file-upload
-                          class="Upload"
-                          :disabled="isDetail == '007'"
-                          :accept="'.jpg,.png,.jpeg'"
-                          :multiple="true"
-                          :uploadcondition="beforeAvatarUpload"
-                          @UploadErrorEvent="UploadErrorEvent"
-                          @UploadSuccessEvent="UploadSuccessEvent"
-                        ></file-upload>
-                      </div>
-                      <div class="txt-tips fl">
-                        <p>大小：小于1M</p>
-                        <p>尺寸：100*100</p>
-                        <p>类型：jpg.png.jpeg</p>
                       </div>
                     </el-form-item>
                   </el-col>
+                  <el-col :span="16">
+                    <el-form-item label="企业名称" required>
+                      {{ ruleForm.company }}
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24">
+                    <el-row>
+                      <el-col :span="8"
+                        ><el-form-item
+                          label="纳税识别号"
+                          required
+                          label-width="100px"
+                          style="width: 100%"
+                        >
+                          {{ ruleForm.inv_code }}
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="7">
+                        <el-form-item label="成立日期" required>
+                          {{ ruleForm.inv_time }}
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="9">
+                        <el-form-item label="公司类型" required>
+                          {{ ruleForm.type }}</el-form-item
+                        ></el-col
+                      >
+                    </el-row>
+                  </el-col>
+
+                  <el-col :span="18">
+                    <el-form-item label="详细地址" required>
+                      {{ ruleForm.addr }}
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="联系人" required>
+                      {{ ruleForm.contactor }}
+                    </el-form-item></el-col
+                  >
+
+                  <el-col :span="24">
+                    <el-form-item label="营业范围" required>
+                      {{ ruleForm.inv_scope }}
+                    </el-form-item>
+                  </el-col>
                 </el-row>
               </el-col>
             </el-row>
@@ -216,7 +154,7 @@
                   <el-col :span="13">
                     <el-form-item label="联系地址" prop="addr">
                       <el-input
-                        v-model="ruleForm.addr"
+                        v-model="ruleForm.inv_addr"
                         placeholder="联系地址"
                         maxlength="100"
                         :disabled="isDetail == '007'"
@@ -257,32 +195,12 @@
 <script>
 import asyncRequest from "@/apis/service/serviceParam/workCompany";
 import resToken from "@/mixins/resToken";
-import {
-  isMobile,
-  isLicense,
-  isPhone,
-  isChinese,
-  isEmoticon,
-  isSpecialSymbol,
-  hasSpace,
-  isAddr,
-} from "@/utils/validate";
+import { isMobile, isPhone, invTime } from "@/utils/validate";
 export default {
   name: "workCompany",
   props: ["showModel", "id", "isDetail"],
   mixins: [resToken],
   data() {
-    const validateLicense = (rule, value, callback) => {
-      if (value !== "") {
-        if (!isLicense(value)) {
-          callback(new Error("统一社会信用代码不正确！"));
-        } else {
-          callback();
-        }
-      } else {
-        callback(new Error("统一社会信用代码不能为空！"));
-      }
-    };
     const validatemobile = (rule, value, callback) => {
       if (value !== "") {
         if (isPhone(value) || isMobile(value)) {
@@ -294,47 +212,7 @@ export default {
         callback(new Error("联系电话不能为空！"));
       }
     };
-    const validatename = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("法人不能为空！"));
-      } else {
-        if (!isChinese(value)) {
-          callback(new Error("法人只能为汉字！"));
-        } else if (isEmoticon(value)) {
-          callback(new Error("法人只能为汉字！"));
-        } else {
-          callback();
-        }
-      }
-    };
-    const validatecontactor = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("联系人不能为空！"));
-      } else {
-        if (!isChinese(value)) {
-          callback(new Error("联系人只能为汉字！"));
-        } else if (isEmoticon(value)) {
-          callback(new Error("联系人只能为汉字！"));
-        } else {
-          callback();
-        }
-      }
-    };
-    const validateAddr = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("详细地址不能为空！"));
-      } else {
-        if (hasSpace(value)) {
-          callback(new Error("不能出现/回车/换行符！"));
-        } else if (isSpecialSymbol(value)) {
-          callback(new Error("不能使用英文特殊字符！"));
-        } else if (isAddr(value)) {
-          callback();
-        } else {
-          callback(new Error("详细地址填写不规范！"));
-        }
-      }
-    };
+
     return {
       pickerOptions: {
         disabledDate(time) {
@@ -364,43 +242,6 @@ export default {
       },
       rulesThis: this.rules,
       rules: {
-        company: [{ required: true, message: "企业名称不能为空!", trigger: "blur" }],
-        type: [
-          {
-            required: true,
-            message: "公司类型不能为空！",
-            trigger: "change",
-          },
-        ],
-        inv_code: [
-          {
-            required: true,
-            validator: validateLicense,
-            trigger: "blur",
-          },
-        ],
-        inv_legaler: [
-          {
-            required: true,
-            validator: validatename,
-            trigger: "blur",
-          },
-        ],
-
-        inv_time: [
-          {
-            required: true,
-            message: "成立日期不能为空！",
-            trigger: "change",
-          },
-        ],
-        inv_addr: [
-          {
-            required: true,
-            validator: validateAddr,
-            trigger: "blur",
-          },
-        ],
         inv_bank: [
           {
             required: true,
@@ -415,13 +256,7 @@ export default {
             trigger: "blur",
           },
         ],
-        contactor: [
-          {
-            required: true,
-            validator: validatecontactor,
-            trigger: "blur",
-          },
-        ],
+
         mobile: [
           {
             required: true,
@@ -429,15 +264,7 @@ export default {
             trigger: "blur",
           },
         ],
-        addr: [{ required: true, message: "联系地址不能为空！", trigger: "blur" }],
-        inv_scope: [{ required: true, message: "经营范围不能为空！", trigger: "blur" }],
-        license_img: [
-          {
-            required: false,
-            message: "",
-            trigger: "blur",
-          },
-        ],
+        inv_addr: [{ required: true, message: "联系地址不能为空！", trigger: "blur" }],
       },
     };
   },
@@ -458,11 +285,7 @@ export default {
     async initForm() {
       this.supplier_name = "";
       this.loading = true;
-      if (this.isDetail === "003") {
-        this.title = "新建业务企业";
-        this.rulesThis = this.rules;
-        await this.resetForm();
-      } else if (this.isDetail == "007") {
+      if (this.isDetail == "007") {
         this.title = "业务企业详情";
         this.rulesThis = {};
         await this.resetForm();
@@ -492,7 +315,7 @@ export default {
         const {
           id,
           company, //公司名称
-          type, //	公司类型
+          company_type, //	公司类型
           inv_code, //	纳税识别号
           inv_legaler, //	法人
           inv_time, //注册日期
@@ -509,10 +332,10 @@ export default {
         this.ruleForm = {
           id: id || "",
           company: company || "", //公司名称
-          type: type || "", //	公司类型
+          type: company_type || "", //	公司类型
           inv_code: inv_code || "", //	纳税识别号
           inv_legaler: inv_legaler || "", //	法人
-          inv_time: inv_time || "", //注册日期
+          inv_time: invTime(inv_time) || "", //注册日期
           inv_addr: inv_addr || "", //注册地址
           inv_bank: inv_bank || "", //	银行
           inv_bankNo: inv_bankNo || "", //	银行账户
@@ -561,20 +384,22 @@ export default {
             return;
           }
           this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          const { code, inv_bank, inv_bankNo, inv_addr, mobile, id } = this.ruleForm;
+
+          const model = {
+            id,
+            code,
+            inv_bank,
+            inv_bankNo,
+            inv_addr,
+            mobile,
+          };
+          const res = await asyncRequest.update(model);
 
-          let res = {};
-          if (this.isDetail === "003") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
-          } else {
-            res = await asyncRequest.update(model);
-          }
           this.loading = false;
           if (res && res.code === 0) {
-            const title = this.isDetail === "003" ? "添加成功" : "修改成功";
             this.$notify.success({
-              title,
+              title: "修改成功",
               message: "",
             });
             this.showModelThis = false;

src/views/serviceParam/workCompany/index.vue

@@ -278,14 +278,14 @@ export default {
           width: "100px",
           _slot_: "status",
         },
-        {
-          prop: "company_name",
-          label: "负责人部门",
-          minWidth: "150px",
-        },
+        // {
+        //   prop: "company_name",
+        //   label: "创建人部门",
+        //   minWidth: "150px",
+        // },
         {
           prop: "creater",
-          label: "负责人",
+          label: "创建人",
           width: "100px",
         },
 
@@ -354,7 +354,7 @@ export default {
 
     openModal(row, type) {
       const { status } = row;
-      if (type + '' === "005" && status + '' === "1") {
+      if (type + "" === "005" && status + "" === "1") {
         this.$message.warning("禁用后，才可以修改！");
         return;
       }
@@ -385,7 +385,7 @@ export default {
     },
 
     async statusConfirm(id, status) {
-      let str = status + '' === "1" ? "禁用" : "启用";
+      let str = status + "" === "1" ? "禁用" : "启用";
       await this.$confirm("确定要改为" + str + "?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -395,7 +395,7 @@ export default {
           this.loading = true;
           const model = {
             id: id,
-            status: status + '' === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1",
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {