戴艳蓉 3 anos atrás
pai
commit
fd620c7c1f

+ 1 - 2
src/apis/service/goodStore/goldPrice/index.js

@@ -10,7 +10,6 @@ export default {
   delete: (data, params) => http(api + "goldpricedelect", data, "post", params),
   // 添加
   add: (data, params) => http(api + "goldpricecreate", data, "post", params),
- 
   // 更新
-  update: (data, params) => http(api + "specsave", data, "post", params),
+  update: (data, params) => http(api + "golpriceedit", data, "post", params),
 };

+ 6 - 4
src/views/goodStore/brand/index.vue

@@ -80,7 +80,7 @@
             <el-col :span="4" style="width: 373px">
               <el-input
                 :size="searchSize"
-                v-model="parmValue.name"
+                v-model="parmValue.brand_name"
                 :maxlength="40"
                 @blur="
                   pageInfo.curr = 1;
@@ -124,7 +124,7 @@
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
-          :type="scope.row.status == '1' ? 'warning' : ''"
+          :type="scope.row.status == '0' ? 'warning' : ''"
           v-text="
             (statusOptions.find((item) => item.id == scope.row.status) || {})
               .label || '--'
@@ -157,7 +157,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((item) => item == '004') && scope.row.status === '1'
           "
           effect="dark"
           content="禁用"
@@ -170,7 +170,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((item) => item == '004') && scope.row.status === '0'
           "
           effect="dark"
           content="启用"
@@ -247,6 +247,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
+        brand_name:"",
         status: "",
         creater: "",
       },
@@ -320,6 +321,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
+        brand_name:"",
         status: "",
         creater: "",
       };

+ 1 - 1
src/views/goodStore/goldPrice/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.type"
                 filterable
                 clearable
-                disabled
+               :disabled="id == '007'"
                 placeholder="金属类型"
                 style="width: 100%"
               >

+ 3 - 3
src/views/goodStore/goldPrice/index.vue

@@ -118,7 +118,7 @@
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
-          :type="scope.row.status == '1' ? 'warning' : ''"
+          :type="scope.row.status == '0' ? 'warning' : ''"
           v-text="
             (statusOptions.find((item) => item.id == scope.row.status) || {})
               .label || '--'
@@ -150,7 +150,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((item) => item == '004') && scope.row.status === '1'
           "
           effect="dark"
           content="禁用"
@@ -163,7 +163,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((item) => item == '004') && scope.row.status === '0'
           "
           effect="dark"
           content="启用"

+ 1 - 1
src/views/goodStore/unit/addEdit.vue

@@ -130,7 +130,7 @@ export default {
           }
           this.loading = false;
           if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功!" : "修改成功!";
+            const title = this.id === "003" ? "添加成功!" : "修改成功!";
             this.$notify.success({
               title,
               message: "",

+ 6 - 4
src/views/goodStore/unit/index.vue

@@ -80,7 +80,7 @@
             <el-col :span="4" style="width: 373px">
               <el-input
                 :size="searchSize"
-                v-model="parmValue.name"
+                v-model="parmValue.unit"
                 :maxlength="40"
                 @blur="
                   pageInfo.curr = 1;
@@ -124,7 +124,7 @@
       <template #status="{ scope }">
         <el-tag
           :size="tablebtnSize"
-          :type="scope.row.status == '1' ? 'warning' : ''"
+          :type="scope.row.status == '0' ? 'warning' : ''"
           v-text="
             (statusOptions.find((item) => item.id == scope.row.status) || {})
               .label || '--'
@@ -157,7 +157,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
+            powers.some((item) => item == '004') && scope.row.status === '1'
           "
           effect="dark"
           content="禁用"
@@ -170,7 +170,7 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
+            powers.some((item) => item == '004') && scope.row.status === '0'
           "
           effect="dark"
           content="启用"
@@ -247,6 +247,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
+        unit:"",
         status: "",
         creater: "",
       },
@@ -320,6 +321,7 @@ export default {
         size: 15, // 每页显示条数
         start: "",
         end: "",
+        unit:"",
         status: "",
         creater: "",
       };

+ 8 - 34
src/views/serviceParam/Invoicing/addEdit.vue

@@ -26,14 +26,14 @@
             class="demo-ruleForm"
             ><el-row>
               <el-col :span="24">
-                <el-form-item label="企业客户" prop="companyNo">
+                <el-form-item label="开票信息" prop="companyNo">
                   <search-customer
                     :value="ruleForm.companyNo"
                     :isDetail="this.id !== 'add'"
                     :names="companyNoNames"
                     :disabled="isDetail"
                     @searchChange="companyNo_change"
-                    :placeholder="'企业客户'"
+                    :placeholder="'开票信息'"
                   />
                 </el-form-item>
               </el-col>
@@ -218,7 +218,7 @@ export default {
     return {
       statusList: [],
       loading: false,
-      title: "添加企业客户",
+      title: "添加开票信息",
       showModelThis: this.showModel,
       dataInfo: {},
       companyNoNames: "",
@@ -285,18 +285,19 @@ export default {
       }
     },
     async initForm() {
+      console.log(this.id, this.isDetail);
       this.loading = true;
       this.resetFormData();
       if (this.id === "add") {
-        this.title = "添加企业客户";
+        this.title = "添加开票信息";
         this.rulesThis = this.rules;
         await this.resetForm();
       } else {
         if (this.isDetail) {
-          this.title = "企业客户";
+          this.title = "开票信息";
           this.rulesThis = {};
         } else {
-          this.title = "修改企业客户";
+          this.title = "修改开票信息";
           this.rulesThis = this.rules;
         }
         await this.resetForm();
@@ -360,34 +361,7 @@ export default {
         invoice_mobile: "",
       };
     },
-    async submitCexForm() {
-      await this.$refs.cexForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          console.log(this.id);
-          console.log(this.cexForm);
-          let obj = JSON.parse(JSON.stringify(this.cexForm));
 
-          obj.id = this.id;
-          console.log(obj);
-          let res = await asyncRequest.exam(obj);
-          this.loading = false;
-          if (res.code === 0) {
-            let title = "审核审批成功!";
-            this.$notify.success({
-              title,
-              message: "",
-            });
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
     selectChangeMobile() {
       this.$refs.ruleForm.validateField("invoice_mobile");
     },
@@ -442,7 +416,7 @@ export default {
         this.companyList = res.data;
       }
     },
-    //企业客户选择
+    //开票信息选择
     companyNo_change(e) {
       if (e && e.code) {
         this.ruleForm.companyNo = [e.code];

+ 9 - 6
src/views/serviceParam/Invoicing/index.vue

@@ -45,7 +45,7 @@
                   filterable
                   clearable
                   :size="searchSize"
-                  placeholder="规格状态"
+                  placeholder="状态"
                   style="width: 100%"
                   @change="
                     pageInfo.curr = 1;
@@ -55,9 +55,9 @@
                 >
                   <el-option
                     v-for="item in statusList"
-                    :key="'status' + item.code"
-                    :label="item.name"
-                    :value="item.code"
+                    :key="'status' + item.id"
+                    :label="item.label"
+                    :value="item.id"
                   />
                 </el-select>
               </el-col>
@@ -126,7 +126,7 @@
                   :size="searchSize"
                   type="success"
                   style="float: right"
-                  @click="openModal({}, '003')"
+                  @click="openModal('add', false)"
                 >
                   添加
                 </el-button>
@@ -284,7 +284,10 @@ export default {
       ],
       select: "invoice_code",
       sinput: "",
-      statusList: [],
+      statusList: [
+        { id: "0", label: "禁用" },
+        { id: "1", label: "启用" },
+      ],
       loading: true,
       showModel: false,
       isDetail: false,

+ 2 - 0
src/views/serviceParam/business/addEdit.vue

@@ -150,6 +150,7 @@
                   :showModel="editModel"
                   :index="findex"
                   :sitem="sitem"
+                  @cancel="editModel = false"
                   @refresh="contactRefresh"
                 />
               </el-col>
@@ -323,6 +324,7 @@ export default {
     },
     contactRefresh(e) {
       console.log(e);
+      this.editModel = false;
       const { index } = e;
       if (index + "" === "-1") {
         this.tableData.push(e);

+ 3 - 0
src/views/serviceParam/business/contactModal.vue

@@ -230,6 +230,8 @@ export default {
   methods: {
     async initForm() {
       this.loading = true;
+      console.log(this.index);
+      console.log(this.sitem);
       this.resetFormData();
       this.rulesThis = this.rules;
       if (this.index + "" === "-1") {
@@ -281,6 +283,7 @@ export default {
         if (valid) {
           this.showModelThis = false;
           let item = JSON.parse(JSON.stringify(this.ruleForm));
+          item.index = this.index;
           // 刷新
           this.$emit("refresh", item);
         } else {

+ 1 - 1
src/views/serviceParam/business/index.vue

@@ -140,7 +140,7 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="150">
+        <el-table-column fixed="right" label="操作" width="170">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="查看信息" placement="top">
               <i

+ 13 - 13
src/views/serviceParam/workCompany/addEdit.vue

@@ -525,18 +525,18 @@ export default {
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
             id: "",
-            company: "北京万宇恒通国际科贸有限公司", //公司名称
-            type: "1", //	公司类型
-            inv_code: "91110113MA004JNJ28", //	纳税识别号
-            inv_legaler: "某某某", //	法人
-            inv_time: "2021-02-14", //注册日期
-            inv_addr: "北京市顺义区信中街12号院8号楼-1至4层101内三层309室", //注册地址
-            inv_bank: "中国农业银行股份有限公司北京空港支行", //	银行
-            inv_bankNo: "11120901040013561", //	银行账户
-            contactor: "张三", //		联系人
-            mobile: "69464815", //	联系人电话
-            addr: "北京市顺义区信中街12号院8号楼-1至4层101内三层309室", //		联系地址
-            inv_scope: "1", //	经营范围
+            company: "", //公司名称
+            type: "", //	公司类型
+            inv_code: "", //	纳税识别号
+            inv_legaler: "", //	法人
+            inv_time: "", //注册日期
+            inv_addr: "", //注册地址
+            inv_bank: "", //	银行
+            inv_bankNo: "", //	银行账户
+            contactor: "", //		联系人
+            mobile: "", //	联系人电话
+            addr: "", //		联系地址
+            inv_scope: "", //	经营范围
             license_img: "", //	营业执照
           };
         }
@@ -557,7 +557,7 @@ export default {
           }
           this.loading = false;
           if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功" : "修改成功";
+            const title = this.isDetail === "003" ? "添加成功" : "修改成功";
             this.$notify.success({
               title,
               message: "",

+ 2 - 2
src/views/serviceParam/workCompany/index.vue

@@ -175,7 +175,7 @@
           >
             <i
               class="el-icon-video-pause tb-icon"
-              @click="changeStatus(scope.row.id, scope.row.status)"
+              @click="statusConfirm(scope.row.id, scope.row.status)"
             ></i>
           </el-tooltip>
           <el-tooltip
@@ -188,7 +188,7 @@
           >
             <i
               class="el-icon-video-play tb-icon"
-              @click="changeStatus(scope.row.id, scope.row.status)"
+              @click="statusConfirm(scope.row.id, scope.row.status)"
             ></i>
           </el-tooltip>
           <el-tooltip