供应商 /企业客户 商品成本录入

src/apis/service/serviceParam/supplier/index.js

@@ -25,4 +25,6 @@ export default {
   kstatus: (data, params) => http(api + 'keepbstatus', data, 'post', params),
   // 详情
   kdetail: (data, params) => http(api + "keepbinfo", data, "post", params),
+  // 更新
+  kupdate: (data, params) => http(api + "suppleredit", data, "post", params),
 };

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

@@ -70,13 +70,19 @@ export default {
     };
   },
   watch: {
-    //  names: function (val, old) {
-    //   // console.log(val, old);
-    //   this.searchName = val;
-    //   if (this.isDetail && this.searchName) {
-    //     this.remoteMethod(this.searchName);
-    //   }
-    // },
+    names: function (val, old) {
+      // console.log(val, old, this.isDetail, "1");
+      this.searchName = val;
+      if (this.isDetail && this.searchName) {
+        this.remoteMethod(this.searchName);
+      }
+    },
+    isDetail: function (val, old) {
+      // console.log(val, old, this.isDetail, "2");
+      if (val && this.searchName) {
+        this.remoteMethod(this.searchName);
+      }
+    },
   },
   mounted() {
     this.options = [];
@@ -105,9 +111,9 @@ export default {
       if (query !== "") {
         this.options = [];
         this.formValue.name = query;
-       const {code ,data,message} = await asyncRequest.list(this.formValue);
+        const { code, data, message } = await asyncRequest.list(this.formValue);
 
-        if (code === 0 ) {
+        if (code === 0) {
           const { list } = data;
           this.options = list;
         } else if (code >= 100 && code <= 104) {

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

@@ -8,7 +8,7 @@
     reserve-keyword
     :size="size || 'medium'"
     style="width: 100%"
-    :placeholder="placeholder||''"
+    :placeholder="placeholder || ''"
     :disabled="disabled"
     :remote-method="remoteMethod"
     :loading="selectLoading"
@@ -18,8 +18,8 @@
       v-for="(item, index) in options"
       :key="item.id + index"
       :label="item.name"
-      :value="item.code+''"
-      :disabled="item.status!=='1'"
+      :value="item.code + ''"
+      :disabled="item.status !== '1'"
     >
     </el-option>
   </el-select>
@@ -31,7 +31,15 @@ import resToken from "@/mixins/resToken";
 export default {
   name: "SearchSupplier",
   mixins: [resToken],
-  props: ["size", "value", "placeholder", "isDetail", "disabled", "names",'type'],
+  props: [
+    "size",
+    "value",
+    "placeholder",
+    "isDetail",
+    "disabled",
+    "names",
+    "type",
+  ],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小            非必填
@@ -55,12 +63,18 @@ export default {
   },
   watch: {
     names: function (val, old) {
-      // console.log(val, old);
+      // console.log(val, old, this.isDetail, "1");
       this.searchName = val;
       if (this.isDetail && this.searchName) {
         this.remoteMethod(this.searchName);
       }
     },
+    isDetail: function (val, old) {
+      // console.log(val, old, this.isDetail, "2");
+      if (val && this.searchName) {
+        this.remoteMethod(this.searchName);
+      }
+    },
   },
   mounted() {
     this.options = [];
@@ -93,7 +107,7 @@ export default {
           size: 100,
           name: query,
           code: "",
-          is_platform:this.type?this.type:""
+          is_platform: this.type ? this.type : "",
         };
 
         let res = await asyncRequest.list(formValue);

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

@@ -26,18 +26,20 @@
             label-width="90px"
             class="demo-ruleForm"
           >
-            <el-form-item label="供应商" prop="gyscode">
-              <el-input
-                v-model="ruleForm.gyscode"
-                disabled
-                placeholder="支持品牌来源"
-                minlength="20"
+            <el-form-item label="供应商" v-if="gys_name" prop="gyscode">
+              <search-supplier
+                :disabled="true"
+                :value="ruleForm.gyscode"
+                :placeholder="'供应商'"
+                :isDetail="true"
+                :names="gys_name"
               />
             </el-form-item>
             <el-form-item label="支持品牌" prop="brand_id">
               <search-brand
                 :value="ruleForm.brand_id"
                 :size="'mini'"
+                :disabled="type === 'view'"
                 :isDetail="type !== 'add'"
                 :names="brand_name"
                 :placeholder="'商品品牌'"
@@ -45,19 +47,30 @@
               />
             </el-form-item>
             <el-form-item label="授权类型" prop="long">
-              <el-radio-group v-model="ruleForm.long">
+              <el-radio-group
+                :disabled="type === 'view'"
+                v-model="ruleForm.long"
+              >
                 <el-radio :label="'0'">长期</el-radio>
                 <el-radio :label="'1'">非长期</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="授权时间" style="margin: 0">
+            <el-form-item
+              v-if="ruleForm.long === '1'"
+              label="授权时间"
+              style="margin: 0"
+            >
               <el-col :span="11">
                 <el-form-item prop="starttime">
                   <el-date-picker
                     type="date"
+                    :disabled="type === 'view'"
                     placeholder="开始日期"
                     v-model="ruleForm.starttime"
+                    :picker-options="pickerOptions1"
                     style="width: 100%"
+                    value-format="yyyy-MM-dd"
+                    @change="timeChange"
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
@@ -66,9 +79,13 @@
                 <el-form-item prop="endtime">
                   <el-date-picker
                     type="date"
+                    :disabled="type === 'view'"
                     placeholder="结束日期"
+                    value-format="yyyy-MM-dd"
                     v-model="ruleForm.endtime"
+                    :picker-options="pickerOptions2"
                     style="width: 100%"
+                    @change="timeChange"
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
@@ -89,7 +106,7 @@
                   <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                   <file-upload
                     class="Upload"
-                    :disabled="id == '007'"
+                    :disabled="type === 'view'"
                     :accept="'.jpg,.png,.jpeg'"
                     :multiple="true"
                     :uploadcondition="beforeAvatarUpload"
@@ -101,14 +118,14 @@
             </el-col>
             <el-col :span="7" style="text-align: right; padding: 72px 0 0 0">
               <el-button
-                v-if="id !== '007'"
+                v-if="type !== 'view'"
                 :size="'small'"
                 type="primary"
                 @click="submitForm"
                 >保 存
               </el-button>
               <el-button @click="showModelThis = false" :size="'small'">{{
-                id == "007" ? "关 闭" : "取 消"
+                type === "view" ? "关 闭" : "取 消"
               }}</el-button>
             </el-col>
           </el-form>
@@ -122,18 +139,39 @@ import asyncRequest from "@/apis/service/serviceParam/supplier";
 import resToken from "@/mixins/resToken";
 export default {
   name: "brand",
-  props: ["showModel", "id", "sitem"],
+  props: ["showModel", "id", "type", "sitem"],
   mixins: [resToken],
   data() {
     return {
       loading: false,
       title: "添加支持品牌",
       showModelThis: this.showModel,
-      select: "1",
-      activeOptions: [],
-      actionList: [],
+      brand_name: "",
+      gys_name: "",
       ruleForm: {},
       rulesThis: this.rules,
+      pickerOptions1: {
+        disabledDate: (time) => {
+          if (
+            this.ruleForm.endtime != null &&
+            this.ruleForm.endtime != "" &&
+            time
+          ) {
+            return time.getTime() > new Date(this.ruleForm.endtime).valueOf();
+          }
+        },
+      },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          if (
+            this.ruleForm.starttime != null &&
+            this.ruleForm.starttime != "" &&
+            time
+          ) {
+            return time.getTime() < new Date(this.ruleForm.starttime).valueOf();
+          }
+        },
+      },
       rules: {
         gyscode: [
           {
@@ -183,21 +221,25 @@ export default {
   methods: {
     async initForm() {
       this.loading = true;
+      this.brand_name = "";
+      this.gys_name = "";
       this.resetFormData();
-      if (this.id === "003") {
+      if (this.type === "add") {
         this.rulesThis = this.rules;
         this.title = "添加支持品牌";
         await this.resetForm();
-      } else if (this.id === "005") {
+      } else if (this.type === "edit") {
         this.rulesThis = this.rules;
         this.title = "修改支持品牌";
         await this.resetForm();
+        await this.initData();
       } else {
         this.rulesThis = {};
         this.title = "查看支持品牌";
         await this.resetForm();
+        await this.initData();
       }
-
+      console.log(this.brand_name, this.gys_name, this.ruleForm);
       this.loading = false;
     },
     async resetForm() {
@@ -210,12 +252,42 @@ export default {
         }
       });
     },
+    timeChange() {
+      if (
+        this.ruleForm.starttime !== "" &&
+        this.ruleForm.starttime !== null &&
+        this.ruleForm.endtime !== "" &&
+        this.ruleForm.endtime !== null
+      ) {
+        if (
+          new Date(this.ruleForm.endtime).valueOf() <
+          new Date(this.ruleForm.starttime).valueOf()
+        ) {
+          this.$message.warning("结束时间不大于开始时间！");
+          this.ruleForm.endtime = "";
+          this.ruleForm.starttime = "";
+          this.$refs.ruleForm.validateField("starttime");
+          this.$refs.ruleForm.validateField("endtime");
+        } else {
+          this.$refs.ruleForm.validateField("starttime");
+          this.$refs.ruleForm.validateField("endtime");
+        }
+      } else {
+        this.$refs.ruleForm.validateField("starttime");
+        this.$refs.ruleForm.validateField("endtime");
+      }
+    },
     resetFormData() {
+      const { code, name } = JSON.parse(JSON.stringify(this.sitem));
+      if (this.type === "add") {
+        this.gys_name = name || "";
+      }
+
       this.ruleForm = {
         id: "",
-        gyscode: "",
+        gyscode: this.type === "add" && code ? [code] : [],
         brand_id: [],
-        long: "",
+        long: "1",
         starttime: "",
         endtime: "",
         brand_book: "",
@@ -237,10 +309,13 @@ export default {
           starttime,
           endtime,
           gyscode,
+          name,
         } = data;
+        this.brand_name = brand_name;
+        this.gys_name = name;
         this.ruleForm = {
           id: id || "",
-          gyscode: gyscode || "",
+          gyscode: gyscode ? [gyscode] : [],
           brand_id: brand_id ? [brand_id] : [],
           long: long || "",
           starttime: starttime || "",
@@ -258,16 +333,19 @@ export default {
         if (valid) {
           this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
+          model.brand_id = model.brand_id.toString();
+          model.gyscode = model.gyscode.toString();
+
           let res = {};
-          if (this.id === "003") {
+          if (this.type === "add") {
             delete model["id"];
-            res = await asyncRequest.add(model);
+            res = await asyncRequest.kadd(model);
           } else {
-            res = await asyncRequest.update(model);
+            res = await asyncRequest.kupdate(model);
           }
           this.loading = false;
           if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功!" : "修改成功!";
+            const title = this.type === "add" ? "添加成功!" : "修改成功!";
             this.$notify.success({
               title,
               message: "",

src/views/serviceParam/supplier/components/show-brand-list/columns.js

@@ -1,71 +1,55 @@
 export default [
   // { type: "selection", fixed: "left", _noset_: true },
   {
-    prop: "spuCode",
-    label: "编号",
-    width: "160px",
-  },
-  {
-    prop: "good_thumb_img",
-    label: "图片",
-    _slot_: "good_thumb_img",
-    width: "45px",
-  },
-  {
-    prop: "good_name",
-    label: "名称",
-    "min-width": "160px",
-  },
-  {
-    prop: "cat_name",
-    label: "分类",
+    prop: "gyscode",
+    label: "供应商编号",
+    width: "140px",
   },
   {
     prop: "brand_name",
     label: "品牌",
+    width: "100px",
   },
   {
-    prop: "good_type",
-    label: "是否定制",
-    _slot_: "good_type",
-    width: "70px",
-  },
-  {
-    prop: "good_unit",
-    label: "单位",
-    width: "45px",
+    prop: "status",
+    label: "状态",
+    width: "60",
+    _slot_: "status",
   },
   {
-    prop: "tax",
-    label: "税率",
-    width: "45px",
+    prop: "brand_book",
+    label: "授权图",
+    _slot_: "brand_book",
+    width: "60px",
   },
 
   {
-    prop: "supplierNo",
-    label: "供应商编号",
-    width: "110px",
+    prop: "long",
+    label: "授权类型",
+    width: "70",
+    _slot_: "long",
   },
   {
-    prop: "supplier_name",
-    label: "供应商名称",
-    width: "110px",
+    prop: "longTime",
+    label: "授权日期",
+    width: "180",
+    _slot_: "longTime",
   },
   {
-    prop: "companyNo",
-    label: "业务公司编号",
-    width: "110px",
+    prop: "creater",
+    label: "创建人",
+    width: "60px",
   },
   {
-    prop: "company",
-    label: "业务公司名称",
-    width: "110px",
+    prop: "addtime",
+    label: "添加时间",
+    width: "145px",
   },
   {
     prop: "",
     label: "操作",
     fixed: "right",
-    width: "180",
+    width: "140",
     _noset_: true,
     _slot_: "operation",
   },

src/views/serviceParam/supplier/components/show-brand-list/index.vue

@@ -37,6 +37,9 @@
       >
         <template #table-header="{}">
           <div style="margin: -10px 0 10px 0; width: 100%" class="tr">
+            <div v-if="modelSitem" class="fl" style="height:28px;line-height:28px">
+              <span>供应商：</span>{{ modelSitem.name }}
+            </div>
             <el-button
               type="primary"
               style="margin: 0 0 0 10px"
@@ -64,26 +67,39 @@
             </el-button>
           </div>
         </template>
-        <template #good_thumb_img="{ scope }">
+        <template #brand_book="{ scope }">
           <div
-            v-if="scope.row.good_thumb_img"
+            v-if="scope.row.brand_book"
             style="width: 20px; height: 20px"
             class="hover"
             v-viewer
           >
             <img
-              :src="scope.row.good_thumb_img"
+              :src="scope.row.brand_book"
               style="display: inline-block; width: 100%; height: 100%"
               alt=""
             />
           </div>
         </template>
-        <template #good_type="{ scope }">
+        <template #long="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.good_type == '0' ? 'warning' : ''"
+            :type="scope.row.long == '1' ? 'warning' : ''"
             v-text="
-              (options1.find((item) => item.id == scope.row.good_type) || {})
+              (options1.find((item) => item.id == scope.row.long) || {}).name ||
+              '--'
+            "
+          ></el-tag>
+        </template>
+        <template #longTime="{ scope }">
+          {{ scope.row.starttime }}~{{ scope.row.endtime }}
+        </template>
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (options2.find((item) => item.id == scope.row.status) || {})
                 .name || '--'
             "
           ></el-tag>
@@ -130,7 +146,7 @@
           <el-tooltip effect="dark" content="删除" placement="top">
             <i
               class="el-icon-delete tb-icon"
-              @click="openCostEditDelete(scope.$index)"
+              @click="deleteItem(scope.row.id)"
             ></i>
           </el-tooltip>
         </template>
@@ -138,8 +154,11 @@
       <add-edit
         :id="modelId"
         :type="modelType"
+        :sitem="modelSitem"
         :showModel="costshowModel"
         :code="code"
+        @cancel="costshowModel = false"
+        @refresh="(costshowModel = false), searchList()"
       />
     </el-card>
   </el-dialog>
@@ -172,7 +191,7 @@ export default {
       }
     },
   },
-  props: ["showModel", "code"],
+  props: ["showModel", "sitem"],
 
   /**
    * 属性集合
@@ -186,12 +205,17 @@ export default {
   data() {
     return {
       options1: [
-        { id: "0", name: "否" },
-        { id: "1", name: "是" },
+        { id: "0", name: "长期" },
+        { id: "1", name: "非长期" },
+      ],
+      options2: [
+        { id: "0", name: "禁用" },
+        { id: "1", name: "启用" },
       ],
       costshowModel: false,
+      modelSitem: null,
       modelId: "",
-      modelType: {},
+      modelType: "",
       selectLoading: false,
       loading: true,
       showModelThis: false,
@@ -226,7 +250,7 @@ export default {
     showModel: function (val) {
       this.showModelThis = val;
       if (val) {
-        this.searchList();
+        this.initd();
       }
     },
     showModelThis(val) {
@@ -237,7 +261,11 @@ export default {
   },
 
   methods: {
-    restSearch() {
+    async initd() {
+      this.modelSitem = JSON.parse(JSON.stringify(this.sitem));
+      await this.restSearch();
+    },
+    async restSearch() {
       this.parmValue = {
         gyscode: this.code, // 供应商code
         page: 1, // 页码
@@ -249,11 +277,11 @@ export default {
         curr: 1,
         total: 0,
       };
-      this.searchList();
+      await this.searchList();
     },
     async searchList() {
       this.loading = true;
-      this.parmValue.gyscode = this.code;
+      this.parmValue.gyscode = this.modelSitem.code;
       const res = await asyncRequest.klist(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
@@ -289,7 +317,7 @@ export default {
             id: id,
             status: status === "1" ? "0" : "1",
           };
-          const res = await asyncRequest.status(model);
+          const res = await asyncRequest.kstatus(model);
           if (res && res.code === 0) {
             this.loading = false;
             this.$notify.success({
@@ -318,7 +346,7 @@ export default {
           const model = {
             id: id,
           };
-          const res = await asyncRequest.delete(model);
+          const res = await asyncRequest.kdelete(model);
           if (res && res.code === 0) {
             this.$notify.success({
               title: "删除成功",

src/views/serviceParam/supplier/index.vue

@@ -210,7 +210,7 @@
         >
           <i
             class="el-icon-search tb-icon"
-            @click="openModal(scope.row.code)"
+            @click="openModal(scope.row)"
           ></i>
         </el-tooltip>
       </template>
@@ -218,9 +218,9 @@
     <no-auth v-else></no-auth>
     <!-- 查看支持品牌 -->
     <show-brand-list
-      :code="modelId"
+      :sitem="modelSitem"
       :show-model="showModel"
-      @refresh="searchList"
+      @refresh="showModel = false"
       @cancel="showModel = false"
     />
   </div>
@@ -261,7 +261,7 @@ export default {
       roleLevel: roleLevel,
       loading: true,
       showModel: false,
-      modelId: "000",
+      modelSitem: null,
       stype: {},
       parmValue: {
         page: 1, // 页码
@@ -357,8 +357,8 @@ export default {
       this.searchList();
     },
     // 新建/编辑/详情
-    openModal(id) {
-      this.modelId = id;
+    openModal(sitem) {
+      this.modelSitem = sitem;
       this.showModel = true;
     },
     // 时间