暂存

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

@@ -3,13 +3,13 @@ import http from "@/apis/axios";
 const api = "admin/";
 export default {
   // 添加
-  add: (data, params) => http(api + "brandcreate", data, "post", params),
+  add: (data, params) => http(api + "suppliercreate", data, "post", params),
   // 删除
-  delete: (data, params) => http(api + "branddel", data, "post", params),
+  delete: (data, params) => http(api + "supplierdel", data, "post", params),
   // 分页查询
-  list: (data, params) => http(api + "brandlist", data, "post", params),
+  list: (data, params) => http(api + "supplierlist", data, "post", params),
   // 更新
-  update: (data, params) => http(api + "brandedit", data, "post", params),
+  update: (data, params) => http(api + "supplieredit", data, "post", params),
   // 修改状态
-  status: (data, params) => http(api + 'brandstatus', data, 'post', params),
+  status: (data, params) => http(api + 'supplierstatus', data, 'post', params),
 };

src/views/goodStore/brand/addEdit.vue

@@ -58,7 +58,7 @@
               <div class="txt-tips fl">
                 <p>大小：小于1M</p>
                 <p>尺寸：100*100</p>
-                <p>类型：jpg.png.bmp.jpeg.gif</p>
+                <p>类型：jpg.png.jpeg</p>
               </div>
             </el-form-item>
           </el-form>
@@ -204,21 +204,23 @@ export default {
       return isJPG && isLt2M;
     },
     //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.ruleForm.logo_url = "";
-      this.$refs.ruleForm.validateField("logo_url");
+    UploadErrorEvent(res) {
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.ruleForm.logo_url = "";
+        this.$refs.ruleForm.validateField("logo_url");
+      }
     },
     //图片上传成功
-    UploadSuccessEvent(data) {
-
-
-
-      let res = data.url;
-      const { url } = res;
-      this.ruleForm.logo_url = url;
-      this.$message.success("图片上传成功!");
-      this.$refs.ruleForm.validateField("logo_url");
+    async UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.ruleForm.logo_url = url;
+        this.$message.success("图片上传成功!");
+        this.$refs.ruleForm.validateField("logo_url");
+      }
     },
   },
 };
@@ -226,6 +228,5 @@ export default {
 
    <style lang="scss" scoped>
 .brand {
- 
 }
 </style>

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -129,7 +129,7 @@
                       <i class="el-icon-plus avatar-uploader-icon"></i>
                       <file-upload
                         class="Upload"
-                        :accept="'.jpg,.png,.bmp,.jpeg,.gif'"
+                        :accept="'.jpg,.png,.jpeg'"
                         :multiple="true"
                         :uploadcondition="beforeAvatarUpload"
                         @UploadErrorEvent="UploadErrorEvent"
@@ -140,7 +140,7 @@
                   <div class="txt-tips fl">
                     <p>
                       <span sty>大小：小于1M；</span><span>尺寸：100*100；</span
-                      ><span>类型：jpg.png.bmp.jpeg.gif</span>
+                      ><span>类型：jpg.png.jpeg</span>
                     </p>
                   </div>
                 </el-form-item>
@@ -334,7 +334,6 @@
    <script>
 import asyncRequest from "@/apis/service/goodStore/dealGoodsPool";
 
-
 export default {
   name: "dealGoodsPool",
   props: ["showModel", "id", "isDetail"],
@@ -905,20 +904,26 @@ export default {
       }
     },
     //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("image");
+    UploadErrorEvent(res) {
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.$refs.ruleForm.validateField("image");
+      }
     },
     closeImg(index) {
       this.baseForm.image.splice(index, 1);
       this.$refs.baseForm.validateField("image");
     },
     //图片上传成功
-    UploadSuccessEvent(data) {
-      console.log(data);
-      this.baseForm.image.push(data.url);
-      this.$message.success("图片上传成功!");
-      this.$refs.baseForm.validateField("image");
+    async UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.baseForm.image.push(url);
+        this.$message.success("图片上传成功!");
+        this.$refs.baseForm.validateField("image");
+      }
     },
     //判断图片规格
     beforeAvatarUpload(file) {
@@ -927,9 +932,7 @@ export default {
       if (
         file.type === "image/jpg" ||
         file.type === "image/png" ||
-        file.type === "image/bmp" ||
-        file.type === "image/jpeg" ||
-        file.type === "image/gif"
+        file.type === "image/jpeg"
       ) {
         isJPG = true;
       }
@@ -1172,8 +1175,6 @@ export default {
       }
     }
   }
-
-  
 }
 </style>
    

src/views/goodStore/goldPrice/addEdit.vue

@@ -48,14 +48,13 @@
                 :placeholder="'最新价格'"
                 :min="0"
                 :max="10000000000"
-               
                 :position="'right'"
                 :precision="2"
                 :controls="false"
                 :disabled="id == '007'"
                 :append="'元'"
               />
-               <!-- :step="0.01" -->
+              <!-- :step="0.01" -->
             </el-form-item>
           </el-form>
         </el-col>
@@ -192,7 +191,6 @@ export default {
         if (
           file.type === "image/jpg" ||
           file.type === "image/png" ||
-          file.type === "image/bmp" ||
           file.type === "image/jpeg"
         ) {
           isJPG = true;
@@ -209,18 +207,25 @@ export default {
       return isJPG && isLt2M;
     },
     //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.ruleForm.logo_url = "";
-      this.logo_url = "";
-      this.$refs.ruleForm.validateField("logo_url");
+    UploadErrorEvent(res) {
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.ruleForm.logo_url = "";
+        this.logo_url = "";
+        this.$refs.ruleForm.validateField("logo_url");
+      }
     },
+
     //图片上传成功
-    UploadSuccessEvent(data) {
-      this.logo_url = data.url;
-      this.ruleForm.logo_url = data.url;
-      this.$message.success("图片上传成功!");
-      this.$refs.ruleForm.validateField("logo_url");
+    async UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.ruleForm.logo_url = url;
+        this.$message.success("图片上传成功!");
+        this.$refs.ruleForm.validateField("logo_url");
+      }
     },
   },
 };

src/views/goodStore/goodsOnline/addEdit.vue

@@ -106,45 +106,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item
-                  label="商品主图"
-                  prop="image"
-                  class="activity-upload"
-                >
-                  <div class="img-list-main clearfix">
-                    <div
-                      class="img-item"
-                      v-for="(item, index) in baseForm.image"
-                      :key="item + index"
-                    >
-                      <img :src="item" class="avatar" />
-                      <i class="el-icon-close" @click="closeImg(index)"></i>
-                    </div>
-                    <div
-                      class="btnupload"
-                      v-if="baseForm.image.length < 5"
-                      style="position: relative"
-                    >
-                      <i class="el-icon-plus avatar-uploader-icon"></i>
-                      <file-upload
-                        class="Upload"
-                        :accept="'.jpg,.png,.bmp,.jpeg,.gif'"
-                        :multiple="true"
-                        :uploadcondition="beforeAvatarUpload"
-                        @UploadErrorEvent="UploadErrorEvent"
-                        @UploadSuccessEvent="UploadSuccessEvent"
-                      ></file-upload>
-                    </div>
-                  </div>
-                  <div class="txt-tips fl">
-                    <p>
-                      <span sty>大小：小于1M；</span><span>尺寸：100*100；</span
-                      ><span>类型：jpg.png.bmp.jpeg.gif</span>
-                    </p>
-                  </div>
-                </el-form-item>
-              </el-col>
             </el-form>
 
             <el-col :span="24" style="text-align: right">
@@ -374,7 +335,6 @@ export default {
         unit: "",
         supplier: "",
         brandid: "",
-        image: [],
       },
 
       baseRules: {
@@ -385,13 +345,7 @@ export default {
             trigger: "change",
           },
         ],
-        image: [
-          {
-            required: true,
-            message: "请选择商品主图",
-            trigger: "change",
-          },
-        ],
+      
         catid: [
           {
             required: true,
@@ -499,7 +453,6 @@ export default {
               unit: data.good_unit,
               supplier: data.supplier,
               brandid: data.brand_id,
-              image: data.galley.split(","),
             };
             this.oldcatid = this.baseForm.catid;
             await this.specByCat(false);
@@ -513,13 +466,7 @@ export default {
               unit: "件",
               supplier: "8",
               brandid: "3",
-              image: [
-                "http://cum.sit.wanyuhengtong.com/20210425/1edfa0da4eee9b24d1f35d52b6a0ec0a.jpg",
-                "http://cum.sit.wanyuhengtong.com/20210425/cc70a4c06c83d9d8ac27ae35b118a23f.jpg",
-                "http://cum.sit.wanyuhengtong.com/20210425/a5e05dc1c5c75030bcc95f1da1d2d9cb.jpg",
-                "http://cum.sit.wanyuhengtong.com/20210425/9d505e7632891459a29f2fafe28d6705.jpg",
-                "http://cum.sit.wanyuhengtong.com/20210425/714914d7545184e99e240b3affeada07.jpg",
-              ],
+            
             };
           }
 
@@ -637,7 +584,6 @@ export default {
                 let obj = JSON.parse(JSON.stringify(this.baseForm));
                 obj.stock = stock;
                 obj.catid = obj.catid[obj.catid.length - 1];
-                obj.image = obj.image.join();
                 //split(",");
                 console.log(obj);
                 let res = {};
@@ -904,44 +850,9 @@ export default {
         this.supplierOptions = list;
       }
     },
-    //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("image");
-    },
-    closeImg(index) {
-      this.baseForm.image.splice(index, 1);
-      this.$refs.baseForm.validateField("image");
-    },
-    //图片上传成功
-    UploadSuccessEvent(data) {
-      console.log(data);
-      this.baseForm.image.push(data.url);
-      this.$message.success("图片上传成功!");
-      this.$refs.baseForm.validateField("image");
-    },
-    //判断图片规格
-    beforeAvatarUpload(file) {
-      console.log(file);
-      let isJPG = false;
-      if (
-        file.type === "image/jpg" ||
-        file.type === "image/png" ||
-        file.type === "image/bmp" ||
-        file.type === "image/jpeg" ||
-        file.type === "image/gif"
-      ) {
-        isJPG = true;
-      }
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      if (!isJPG) {
-        this.$message.error("图片格式不正确！");
-      }
-      if (!isLt2M) {
-        this.$message.error("图片大小不能超过 1MB!");
-      }
-      return isJPG && isLt2M;
-    },
+
+
+   
     doExchange(arr) {
       let len = arr.length;
       // 当数组大于等于2个的时候

src/views/goodStore/unit/addEdit.vue

@@ -24,43 +24,14 @@
             label-width="80px"
             class="demo-ruleForm"
           >
-            <el-form-item label="品牌名称" prop="brand_name">
+            <el-form-item label="单位名称" prop="unit">
               <el-input
-                v-model="ruleForm.brand_name"
+                v-model="ruleForm.unit"
                 :disabled="id == '007'"
-                placeholder="品牌名称"
+                placeholder="单位名称"
                 minlength="20"
               />
             </el-form-item>
-            <el-form-item
-              label="LOGO"
-              prop="logo_url"
-              :disabled="id == '007'"
-              class="activity-upload"
-            >
-              <div class="btnupload" style="position: relative">
-                <img
-                  v-if="ruleForm.logo_url"
-                  :src="ruleForm.logo_url"
-                  class="avatar"
-                />
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                <file-upload
-                  class="Upload"
-                  :disabled="id == '007'"
-                  :accept="'.jpg,.png,.bmp,.jpeg,.gif'"
-                  :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.bmp.jpeg.gif</p>
-              </div>
-            </el-form-item>
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
@@ -85,20 +56,19 @@ export default {
   data() {
     return {
       loading: false,
-      title: "添加品牌",
+      title: "添加单位",
       showModelThis: this.showModel,
       select: "1",
       activeOptions: [],
       actionList: [],
       ruleForm: {
         id: "",
-        brand_name: "",
-        logo_url: "",
+        unit: "",
       },
       rulesThis: this.rules,
       rules: {
-        brand_name: [
-          { required: true, message: "品牌名称不能为空", trigger: "blur" },
+        unit: [
+          { required: true, message: "单位名称不能为空", trigger: "blur" },
         ],
       },
     };
@@ -120,13 +90,13 @@ export default {
     async initForm() {
       this.loading = true;
       if (this.id === "003") {
-        this.title = "添加品牌";
+        this.title = "添加单位";
         this.rulesThis = this.rules;
       } else if (this.id === "005") {
-        this.title = "修改品牌";
+        this.title = "修改单位";
         this.rulesThis = this.rules;
       } else {
-        this.title = "品牌详情";
+        this.title = "单位详情";
         this.rulesThis = {};
       }
       await this.resetForm();
@@ -138,11 +108,10 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { id, brand_name, logo_url } = this.sitem;
+          const { id, unit} = this.sitem;
           this.ruleForm = {
             id: id || "",
-            brand_name: brand_name || "",
-            logo_url: logo_url || "",
+            unit: unit || "",
           };
         }
       });

src/views/parameter/finance/addEdit.vue

@@ -1,413 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    :title="title"
-    :center="true"
-    align="left"
-    top="5vh"
-    width="1040px"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    @close="showModelThis = false"
-  >
-    <el-card>
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <el-form
-            ref="ruleForm"
-            :model="ruleForm"
-            status-icon
-            :rules="rulesThis"
-            label-width="110px"
-            class="demo-ruleForm"
-          >
-            <el-row :gutter="10">
-              <el-col :span="12">
-                <el-form-item label="单位名称" prop="company_name">
-                  <el-input
-                    v-model="ruleForm.company_name"
-                    :disabled="isDetail"
-                  />
-                </el-form-item> </el-col
-              ><el-col :span="12">
-                <el-form-item label="纳税人识别号" prop="company_license">
-                  <el-input
-                    v-model="ruleForm.company_license"
-                    :disabled="isDetail"
-                  />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-col :span="12">
-              <el-form-item label="银行名称" prop="bank_name">
-                <el-input v-model="ruleForm.bank_name" :disabled="isDetail" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="银行卡号" prop="bankNo">
-                <el-input v-model="ruleForm.bankNo" :disabled="isDetail" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系人" prop="contector">
-                <el-input
-                  v-model="ruleForm.contector"
-                  :disabled="isDetail"
-                /> </el-form-item
-            ></el-col>
-            <el-col :span="12">
-              <el-form-item label="联系电话" prop="mobile">
-                <el-input
-                  v-model="ruleForm.mobile"
-                  :disabled="isDetail"
-                /> </el-form-item
-            ></el-col>
-            <el-col :span="24">
-              <el-form-item label="联系地址" prop="company_address">
-                <el-input
-                  v-model="ruleForm.company_address"
-                  type="textarea"
-                  :rows="3"
-                  :disabled="isDetail"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form>
-        </el-col>
-        <el-col :span="24" style="text-align: right">
-          <el-button v-if="!isDetail" type="primary" @click="submitForm"
-            >保 存
-          </el-button>
-          <el-button @click="showModelThis = false">{{
-            isDetail ? "关 闭" : "取 消"
-          }}</el-button>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-</template>
-<script>
-import asyncRequest from "@/apis/service/parameter/finance";
-import resToken from "@/mixins/resToken";
-import {
-  isMobile,
-  isLicense,
-  isPhone,
-} from "@/utils/validate";
-export default {
-  name: "Account",
-  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)) {
-          callback();
-        } else {
-          callback(new Error("联系电话格式不正确！"));
-        }
-      } else {
-        callback(new Error("请输入联系电话！"));
-      }
-    };
-
-    return {
-      company_img: "",
-      roleList: [],
-      loading: false,
-      title: "添加财务信息",
-      showModelThis: this.showModel,
-      ruleForm: {
-        companyNo: this.id,
-        company_name: "", // 企业名称
-        company_license: "", // 纳税人识别号
-        mobile: "", //联系电话
-        bank_name: "", //银行名称
-        bankNo: "", //银行卡号
-        contector: "", //联系人
-        company_address: "", //联系地址
-        company_img: "", //营业执照
-      },
-      rulesThis: this.rules,
-      rules: {
-        company_license: [
-          {
-            required: true,
-            validator: validateLicense,
-            trigger: "blur",
-          },
-        ],
-        company_name: [
-          {
-            required: true,
-            message: "请输入单位名称",
-            trigger: "blur",
-          },
-        ],
-        bank_name: [
-          {
-            required: true,
-            message: "请输入银行名称",
-            trigger: "blur",
-          },
-        ],
-        bankNo: [
-          {
-            required: true,
-            message: "请输入银行卡号",
-            trigger: "blur",
-          },
-        ],
-        mobile: [
-          {
-            required: true,
-            validator: validatemobile,
-            trigger: "blur",
-          },
-        ],
-        company_address: [
-          {
-            required: true,
-            message: "请输入联系地址",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
-  },
-  watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
-      if (val) {
-        this.initForm();
-      }
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      }
-    },
-  },
-  methods: {
-    
-    async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "添加财务信息";
-        this.rulesThis = this.rules;
-        await this.resetForm();
-      } else {
-        if (this.isDetail) {
-          this.title = "财务信息详情";
-          this.rulesThis = {};
-        } else {
-          this.title = "修改财务信息";
-          this.rulesThis = this.rules;
-        }
-        await this.resetForm();
-        await this.initData();
-      }
-      this.loading = false;
-    },
-    async getRole() {
-      const model = {
-        level: "", // 姓名
-        role_name: "",
-      };
-      const res = await asyncRequest.getRole(model);
-      if (res.code === 0 && res.data) {
-        this.roleList = res.data;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      }else{
-        this.$message.warning(res.message);
-      }
-    },
-    async initData() {
-      const res = await asyncRequest.detail({ companyNo: this.id });
-      if (res && res.code === 0) {
-        this.ruleForm = res.data;
-        this.ruleForm.companyNo = this.id;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      }else{
-        this.$message.warning(res.message);
-      }
-    },
-    async resetForm() {
-      // 重置
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          this.ruleForm = {
-            companyNo: this.id,
-            company_name: "", // 企业名称
-            company_license: "", // 纳税人识别号
-            mobile: "", //联系电话
-            bank_name: "", //银行名称
-            bankNo: "", //银行卡号
-            contector: "", //联系人
-            company_address: "", //联系地址
-            company_img: "", //营业执照
-          };
-        }
-      });
-    },
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          const obj = JSON.parse(JSON.stringify(this.ruleForm));
-
-          let res = {};
-          if (this.id === "add") {
-            delete obj["id"];
-            res = await asyncRequest.add(obj);
-          } else {
-            res = await asyncRequest.update(obj);
-          }
-          this.loading = false;
-          if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功" : "修改成功";
-            this.$notify.success({
-              title,
-              message: "",
-            });
-            this.showModelThis = false;
-            // 刷新
-            this.$emit("refresh");
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.ruleForm.company_img = "";
-      this.company_img = "";
-      this.$refs.ruleForm.validateField("company_img");
-    },
-
-    //图片上传成功
-    UploadSuccessEvent(data) {
-      this.company_img = data.url;
-      this.ruleForm.company_img = data.url;
-      this.$message.success("图片上传成功!");
-      this.$refs.ruleForm.validateField("company_img");
-    },
-
-    //判断图片规格
-    beforeAvatarUpload(file) {
-      let isJPG = false;
-      if (
-        file.type === "image/jpg" ||
-        file.type === "image/png" ||
-        file.type === "image/bmp" ||
-        file.type === "image/jpeg" ||
-        file.type === "image/gif"
-      ) {
-        isJPG = true;
-      }
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      if (!isJPG) {
-        this.$message.error("图片格式不正确！");
-      }
-      if (!isLt2M) {
-        this.$message.error("图片大小不能超过 1MB!");
-      }
-      return isJPG && isLt2M;
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.finance {
-  .activity-upload {
-    .btnupload {
-      float: left;
-      border: 1px solid rgb(220, 223, 230);
-      box-sizing: border-box;
-      width: 135px;
-      height: 135px;
-      line-height: 135px;
-      text-align: center;
-    }
-    .Upload {
-      width: 135px;
-      height: 135px;
-      line-height: 135px;
-      text-align: center;
-      position: absolute;
-      line-height: 0px;
-      top: 0;
-      left: 0;
-      line-height: 135px;
-    }
-    .fileUp {
-      vertical-align: top;
-    }
-    .avatar {
-      width: 135px;
-      height: 135px;
-      line-height: 135px;
-      text-align: center;
-    }
-    .avatar-uploader .el-upload:hover {
-      border-color: #409eff;
-    }
-    .avatar-uploader-icon {
-      font-size: 28px;
-      color: #8c939d;
-      width: 50px;
-      height: 50px;
-      line-height: 50px;
-      text-align: center;
-    }
-    .avatar {
-      width: 100%;
-      height: 100%;
-      display: block;
-    }
-    .txt-tips {
-      display: inline-block;
-      font-size: 13px;
-      color: #606266;
-      padding: 18px 0 0 18px;
-      p {
-        margin: 0;
-        line-height: 30px;
-      }
-    }
-    .avatar-uploader .el-upload {
-      border: 1px dashed #d9d9d9;
-      border-radius: 6px;
-      cursor: pointer;
-      position: relative;
-      overflow: hidden;
-    }
-  }
-}
-</style>

src/views/parameter/finance/index.vue

@@ -1,341 +0,0 @@
-<template>
-  <div class="finance pagePadding">
-    <ex-table
-      v-loading="loading"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-      :table="table"
-      :data="tableData"
-      :columns="columns"
-      :page="pageInfo"
-      :size="size"
-      @page-curr-change="handlePageChange"
-      @page-size-change="handleSizeChange"
-      @screen-reset="
-        pageInfo.curr = 1;
-        searchList();
-      "
-      @screen-submit="
-        pageInfo.curr = 1;
-        searchList();
-      "
-    >
-      <template #table-header="{}">
-        <div style="width: 100%">
-          <el-row :gutter="10">
-            <el-col :span="24">
-              <el-col :span="3" style="width: 195px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-                <el-button
-                  v-if="powers.some((item) => item == '003')"
-                  :size="searchSize"
-                  type="success"
-                  style="float: right; margin: 0"
-                  @click="openModal('add', false)"
-                >
-                  添加
-                </el-button>
-              </el-col>
-            </el-col>
-          </el-row>
-        </div>
-      </template>
-      <template #status="{ scope }">
-        <el-tag
-          :type="scope.row.status == '0' ? 'warning' : ''"
-          :size="size"
-          v-text="
-            (statusOptions.find((item) => item.id == scope.row.status) || {})
-              .label || '--'
-          "
-        ></el-tag>
-      </template>
-      <template #operation="{ scope }">
-        <el-tooltip
-          v-if="powers.some((item) => item == '007')"
-           
-          effect="dark"
-          content="详情"
-          placement="top"
-        >
-          <i
-            class="el-icon-view tb-icon"
-            @click="openModal(scope.row.companyNo, true)"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="powers.some((item) => item == '007')"
-           
-          effect="dark"
-          content="修改"
-          placement="top"
-        >
-          <i
-            class="el-icon-edit tb-icon"
-            @click="openModal(scope.row.companyNo, false)"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="
-            powers.some((item) => item == '004') && scope.row.status === '1'
-          "
-           
-          effect="dark"
-          content="禁用"
-          placement="top"
-        >
-          <i
-            class="el-icon-video-pause tb-icon"
-            @click="statusConfirm(scope.row.companyNo, scope.row.status)"
-          ></i>
-        </el-tooltip>
-        <el-tooltip
-          v-if="
-            powers.some((item) => item == '004') && scope.row.status === '0'
-          "
-           
-          effect="dark"
-          content="启用"
-          placement="top"
-        >
-          <i
-            class="el-icon-video-play tb-icon"
-            @click="statusConfirm(scope.row.companyNo, scope.row.status)"
-          ></i>
-        </el-tooltip>
-      </template>
-    </ex-table>
-    <no-auth v-else></no-auth>
-    <!-- 弹窗 新增/修改 -->
-    <add-edit
-      :id="modelId"
-      :show-model="showModel"
-      :is-detail="isDetail"
-      :contector="contector"
-      :name="name"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    />
-  </div>
-</template>
-<script>
-import asyncRequest from "@/apis/service/parameter/finance";
-import mixinPage from "@/mixins/elPaginationHandle";
-import addEdit from "./addEdit";
-import { mapGetters } from "vuex";
-import resToken from "@/mixins/resToken";
-export default {
-  name: "finance",
-  components: {
-    addEdit,
-  },
-  mixins: [mixinPage, resToken],
-  computed: {
-    //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    powers() {
-      let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "finance"
-        ) || {};
-      if (tran && tran.action && tran.action.length > 0) {
-        return tran.action;
-      } else {
-        return [];
-      }
-    },
-  },
-  
-  data() {
-    return {
-      isDetail: false,
-      // 状态
-      statusOptions: [
-        { id: "0", label: "禁用" },
-        { id: "1", label: "启用" },
-      ],
-      pickerOptions: {
-        // disabledDate是一个函数,参数是当前选中的日期值,这个函数需要返回一个Boolean值,
-        disabledDate(time) {
-          let date = new Date().valueOf();
-          const one = 1000 * 60 * 60 * 24;
-          date = parseInt(date / one) * one;
-          return time.getTime() <= date;
-        },
-      },
-      showModel: false,
-      loading: false,
-      modelId: 0,
-      parmValue: {
-        // name: "", // 账户
-        // contector: "", // 姓名
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-      },
-      // 表格 - 数据
-      tableData: [],
-      // 表格 - 参数
-      table: {
-        stripe: true,
-        border: true,
-        _defaultHeader_: ["setcol"],
-      },
-      // 表格 - 分页
-      pageInfo: {
-        size: 15,
-        curr: 1,
-        total: 0,
-      },
-      // 表格 - 列参数
-      columns: [
-        {
-          prop: "companyNo",
-          label: "信息编号",
-          width: "190px",
-        },
-        {
-          prop: "company_name",
-          label: "单位名称",
-        },
-        {
-          prop: "company_license",
-          label: "纳税人识别号",
-          width: "190px",
-        },
-        {
-          prop: "bank_name",
-          label: "银行名称",
-        },
-        {
-          prop: "bankNo",
-          label: "银行卡号",
-        },
-        {
-          prop: "status",
-          label: "状态",
-          width: "90px",
-          _slot_: "status",
-        },
-        // {
-        //   prop: "contector",
-        //   label: "联系人",
-        // },
-
-        // {
-        //   prop: "mobile",
-        //   label: "联系电话",
-        // },
-        // {
-        //   prop: "company_address",
-        //   label: "地址",
-        // },
-        {
-          prop: "addtime",
-          label: "创建时间",
-          width: "160px",
-          sortable: true,
-        },
-        {
-          prop: "",
-          label: "操作",
-          width: "120px",
-          fixed: "right",
-          _noset_: true,
-          _slot_: "operation",
-        },
-      ],
-    };
-  },
-  mounted() {
-    this.searchList();
-  },
-  methods: {
-    async searchList() {
-      this.loading = true;
-      const res = await asyncRequest.list(this.parmValue);
-      if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
-      }
-      this.loading = false;
-    },
-    openModal(id, isDetail) {
-      this.showModel = true;
-      this.modelId = id;
-      this.isDetail = isDetail;
-    },
-    async statusConfirm(id, status) {
-      await this.$confirm(`确定要改为${status === "1" ? "禁用" : "启用"}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          this.loading = true;
-          const model = {
-            companyNo: id,
-            status: status === "1" ? "0" : "1",
-          };
-          const res = await asyncRequest.status(model);
-          if (res && res.code === 0) {
-            this.loading = false;
-            this.$notify.success({
-              title: "状态修改成功！",
-              message: "",
-            });
-            await this.searchList();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.loading = false;
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.finance {
-  background: rgba(242, 242, 242, 1);
-  min-height: 100%;
-  width: 100%;
-  height: 100%;
-  // background-color: $bg;
-  overflow: hidden;
-
-  // position: absolute;
-  z-index: 2;
-  background: #fff;
-  .change {
-    .title {
-      border-width: 0px;
-      width: 100%;
-      height: 100px;
-      // display: flex;
-      font-weight: 400;
-      font-style: normal;
-      font-size: 22px;
-      text-align: left;
-      padding: 0;
-      padding: 60px 0 0 100px;
-      width: 100%;
-      box-sizing: border-box;
-    }
-  }
-}
-</style>

src/views/purchaseIn/supplier/addEdit.vue

@@ -0,0 +1,235 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    :title="title"
+    :center="true"
+    align="left"
+    top="18vh"
+    width="500px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
+  >
+    <el-card style="margin: -20px 0 0 0">
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-form
+            ref="ruleForm"
+            :model="ruleForm"
+            status-icon
+            :rules="rulesThis"
+            label-width="100px"
+            class="demo-ruleForm"
+          >
+            <el-form-item label="供应商名称" prop="brand_name">
+              <el-input
+                v-model="ruleForm.brand_name"
+                :disabled="id == '007'"
+                placeholder="供应商名称"
+                minlength="20"
+              />
+            </el-form-item>
+            <el-form-item
+              label="营业执照"
+              prop="logo_url"
+              :disabled="id == '007'"
+              class="activity-upload"
+            >
+              <div class="btnupload" style="position: relative">
+                <img
+                  v-if="ruleForm.logo_url"
+                  :src="ruleForm.logo_url"
+                  class="avatar"
+                />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <file-upload
+                  class="Upload"
+                  :disabled="id == '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-form>
+        </el-col>
+        <el-col :span="24" style="text-align: right">
+          <el-button v-if="id !== '007'" type="primary" @click="submitForm"
+            >保 存
+          </el-button>
+          <el-button @click="showModelThis = false">{{
+            id == "007" ? "关 闭" : "取 消"
+          }}</el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import asyncRequest from "@/apis/service/purchaseIn/supplier";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "brand",
+  props: ["showModel", "id", "sitem"],
+  mixins: [resToken],
+  data() {
+    return {
+      loading: false,
+      title: "添加供应商",
+      showModelThis: this.showModel,
+      select: "1",
+      activeOptions: [],
+      actionList: [],
+      ruleForm: {
+        id: "",
+        brand_name: "",
+        logo_url: "",
+      },
+      rulesThis: this.rules,
+      rules: {
+        brand_name: [
+          { required: true, message: "公司名称不能为空", trigger: "blur" },
+        ],
+        logo_url: [
+          { required: true, message: "营业执照不能为空", trigger: "change" },
+        ],
+      },
+    };
+  },
+  watch: {
+    showModel: function (val) {
+      this.showModelThis = val;
+      if (val) {
+        this.initForm();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      if (this.id === "003") {
+        this.title = "添加供应商";
+        this.rulesThis = this.rules;
+      } else if (this.id === "005") {
+        this.title = "修改供应商";
+        this.rulesThis = this.rules;
+      } else {
+        this.title = "供应商详情";
+        this.rulesThis = {};
+      }
+      await this.resetForm();
+      this.loading = false;
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          const { id, brand_name, logo_url } = this.sitem;
+          this.ruleForm = {
+            id: id || "",
+            brand_name: brand_name || "",
+            logo_url: logo_url || "",
+          };
+        }
+      });
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          let res = {};
+          if (this.id === "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.id === "add" ? "添加成功!" : "修改成功!";
+            this.$notify.success({
+              title,
+              message: "",
+            });
+            this.showModelThis = false;
+            // 刷新
+            this.$emit("refresh");
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    //判断图片规格
+    beforeAvatarUpload(file) {
+      let isJPG = false,
+        isLt2M = false;
+      if (file) {
+        if (
+          file.type === "image/jpg" ||
+          file.type === "image/png" ||
+          file.type === "image/jpeg"
+        ) {
+          isJPG = true;
+        }
+        isLt2M = file.size / 1024 / 1024 < 1;
+        if (!isJPG) {
+          this.$message.error("图片格式不正确！");
+        }
+        if (!isLt2M) {
+          this.$message.error("图片大小不能超过 1MB!");
+        }
+      }
+
+      return isJPG && isLt2M;
+    },
+    //图片上传失败
+    UploadErrorEvent(res) {
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.ruleForm.logo_url = "";
+        this.$refs.ruleForm.validateField("logo_url");
+      }
+    },
+    //图片上传成功
+    async UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.ruleForm.logo_url = url;
+        this.$message.success("图片上传成功!");
+        this.$refs.ruleForm.validateField("logo_url");
+      }
+    },
+  },
+};
+</script>
+
+   <style lang="scss" scoped>
+.brand {
+}
+</style>

src/views/purchaseIn/supplier/index.vue

@@ -40,7 +40,7 @@
                 filterable
                 clearable
                 :size="searchSize"
-                placeholder="品牌状态"
+                placeholder="状态"
                 style="width: 100%"
                 @change="
                   pageInfo.curr = 1;
@@ -87,7 +87,7 @@
                   parmValue.page = 1;
                   searchList();
                 "
-                placeholder="品牌名称"
+                placeholder="供应商名称"
               ></el-input>
             </el-col>
             <el-col :span="4" style="width: 170px; padding: 0 0 0 10px">
@@ -195,6 +195,14 @@
       </template>
     </ex-table>
     <no-auth v-else></no-auth>
+     <!-- 弹窗 新增/修改 -->
+    <add-edit
+      :id="modelId"
+      :show-model="showModel"
+      :sitem="sitem"
+      @refresh="searchList"
+      @cancel="showModel = false"
+    />
   </div>
 </template>
 <script>
@@ -203,10 +211,14 @@ import statusList from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
+import addEdit from "./addEdit";
 import resToken from "@/mixins/resToken";
 export default {
   name: "supplier",
   mixins: [mixinPage, resToken],
+   components: {
+    addEdit,
+  },
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -237,6 +249,7 @@ export default {
         end: "",
         status: "",
         creater: "",
+        name:"",
       },
       // 状态
       statusOptions: [
@@ -260,18 +273,24 @@ export default {
       // 表格 - 列参数
       columns: [
         {
-          prop: "id",
-          label: "ID",
+          prop: "code",
+          label: "编号",
+          width:"140"
         },
         {
-          prop: "supplier_name",
-          label: "品牌名称",
+          prop: "name",
+          label: "供应商名称",
         },
         {
           prop: "status",
           label: "状态",
-          sortable: true,
+           width:"60",
           _slot_: "status",
+        },
+          {
+          prop: "legaler",
+          label: "法人",
+           width:"80",
         },
         {
           prop: "creater",
@@ -280,12 +299,14 @@ export default {
         {
           prop: "addtime",
           label: "创建时间",
+           width:"145",
           sortable: true,
         },
         {
           prop: "",
           label: "操作",
           fixed: "right",
+          width:"140",
           _noset_: true,
           _slot_: "operation",
         },
@@ -304,12 +325,13 @@ export default {
         total: 0,
       };
       this.parmValue = {
-        page: 1, // 页码
+       page: 1, // 页码
         size: 15, // 每页显示条数
         start: "",
         end: "",
         status: "",
         creater: "",
+        name:"",
       };
       this.searchList();
     },

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-error-model.vue

@@ -80,7 +80,7 @@
                   <i class="el-icon-plus avatar-uploader-icon"></i>
                   <file-upload
                     class="Upload"
-                    :accept="'.jpg,.png,.bmp,.jpeg'"
+                    :accept="'.jpg,.png,.jpeg'"
                     :multiple="true"
                     :uploadcondition="beforeAvatarUpload"
                     @UploadErrorEvent="UploadErrorEvent"
@@ -95,7 +95,7 @@
           <div class="txt-tips fl">
             <p>
               <span sty>大小：小于1MB；</span><span>尺寸：250*160；</span
-              ><span>类型：jpg.png.bmp.jpeg</span>
+              ><span>类型：jpg.png.jpeg</span>
             </p>
           </div>
           <el-button
@@ -183,7 +183,6 @@ export default {
     },
   },
   methods: {
-    
     async initForm() {
       this.loading = true;
       this.rulesThis = this.rules;
@@ -260,14 +259,18 @@ export default {
       this.show = true;
     },
     //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("error_img");
+    UploadErrorEvent(res) {
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.$refs.ruleForm.validateField("error_img");
+      }
     },
     //图片上传成功
-    UploadSuccessEvent(data) {
-      if (data && data.url && data.url !== "break") {
-        const { url } = data.url;
+    async UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
         this.ruleForm.error_img.push(url);
         this.$message.success("图片上传成功!");
         this.$refs.ruleForm.validateField("error_img");
@@ -281,7 +284,6 @@ export default {
         if (
           file.type === "image/jpg" ||
           file.type === "image/png" ||
-          file.type === "image/bmp" ||
           file.type === "image/jpeg"
         ) {
           isJPG = true;

src/views/sellOut/sellAfterApply/components/addEditForm.vue

@@ -109,7 +109,7 @@
               <i class="el-icon-plus avatar-uploader-icon"></i>
               <file-upload
                 class="Upload"
-                :accept="'.jpg,.png,.bmp,.jpeg'"
+                :accept="'.jpg,.png,,.jpeg'"
                 :multiple="true"
                 :uploadcondition="beforeAvatarUpload"
                 @UploadErrorEvent="UploadErrorEvent"
@@ -428,14 +428,18 @@ export default {
       this.$refs.ruleForm.validateField("error_code");
     },
     //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("error_img");
+    UploadErrorEvent(res) {
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.$refs.ruleForm.validateField("error_img");
+      }
     },
-    //图片上传成功
-    UploadSuccessEvent(data) {
-      if (data && data.url && data.url !== "break") {
-        const { url } = data.url;
+     //图片上传成功
+  async  UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
         this.ruleForm.error_img.push(url);
         this.$message.success("图片上传成功!");
         this.$refs.ruleForm.validateField("error_img");
@@ -449,7 +453,6 @@ export default {
         if (
           file.type === "image/jpg" ||
           file.type === "image/png" ||
-          file.type === "image/bmp" ||
           file.type === "image/jpeg"
         ) {
           isJPG = true;

src/views/sellOut/sellOutOrder/components/addEditFormA.vue

@@ -114,7 +114,7 @@
               <i class="el-icon-plus avatar-uploader-icon"></i>
               <file-upload
                 class="Upload"
-                :accept="'.jpg,.png,.bmp,.jpeg'"
+                :accept="'.jpg,.png,.jpeg'"
                 :multiple="true"
                 :uploadcondition="beforeAvatarUpload"
                 @UploadErrorEvent="UploadErrorEvent"
@@ -293,7 +293,7 @@ export default {
         const res = await asyncRequest.detail(model);
         if (res && res.code === 0 && res.data) {
           let { error_num, error_img, error_remark, except_code, error_code } =
-          console.log(res.data);
+            console.log(res.data);
           this.ruleForm = {
             stock_out_numbers: "", //出库单编号
             anomalous_numbers: error_num, //异常数量
@@ -363,7 +363,7 @@ export default {
               title,
               message: "",
             });
-  this.$emit("refresh", false);
+            this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {
@@ -375,11 +375,7 @@ export default {
         }
       });
     },
- 
-   
-  
 
-   
     // 获取异常原因
     async getReason() {
       let model = {
@@ -407,14 +403,19 @@ export default {
       this.$refs.ruleForm.validateField("company_img");
     },
     //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("anomalous_images");
+    UploadErrorEvent(res) {
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.$refs.ruleForm.validateField("anomalous_images");
+      }
     },
+
     //图片上传成功
-    UploadSuccessEvent(data) {
-      if (data && data.url && data.url !== "break") {
-        const { url } = data.url;
+    async UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
         this.ruleForm.anomalous_images.push(url);
         this.$message.success("图片上传成功!");
         this.$refs.ruleForm.validateField("anomalous_images");
@@ -428,7 +429,6 @@ export default {
         if (
           file.type === "image/jpg" ||
           file.type === "image/png" ||
-          file.type === "image/bmp" ||
           file.type === "image/jpeg"
         ) {
           isJPG = true;

src/views/sellOut/sellOutOrder/components/addEdit_sellForm.vue

@@ -111,7 +111,7 @@
               <i class="el-icon-plus avatar-uploader-icon"></i>
               <file-upload
                 class="Upload"
-                :accept="'.jpg,.png,.bmp,.jpeg'"
+                :accept="'.jpg,.png,.jpeg'"
                 :multiple="true"
                 :uploadcondition="beforeAvatarUpload"
                 @UploadErrorEvent="UploadErrorEvent"
@@ -431,14 +431,18 @@ export default {
       this.$refs.ruleForm.validateField("error_code");
     },
     //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("error_img");
+    UploadErrorEvent(res) {
+        if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.$refs.ruleForm.validateField("error_img");
+      }
     },
-    //图片上传成功
-    UploadSuccessEvent(data) {
-      if (data && data.url && data.url !== "break") {
-        const { url } = data.url;
+        //图片上传成功
+  async  UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
         this.ruleForm.error_img.push(url);
         this.$message.success("图片上传成功!");
         this.$refs.ruleForm.validateField("error_img");
@@ -452,7 +456,6 @@ export default {
         if (
           file.type === "image/jpg" ||
           file.type === "image/png" ||
-          file.type === "image/bmp" ||
           file.type === "image/jpeg"
         ) {
           isJPG = true;

src/views/serviceParam/workCompany/addEdit.vue

@@ -150,7 +150,7 @@
                         <file-upload
                           class="Upload"
                           :disabled="isDetail == '007'"
-                          :accept="'.jpg,.png,.bmp,.jpeg'"
+                          :accept="'.jpg,.png,.jpeg'"
                           :multiple="true"
                           :uploadcondition="beforeAvatarUpload"
                           @UploadErrorEvent="UploadErrorEvent"
@@ -160,7 +160,7 @@
                       <div class="txt-tips fl">
                         <p>大小：小于1M</p>
                         <p>尺寸：100*100</p>
-                        <p>类型：jpg.png.bmp.jpeg</p>
+                        <p>类型：jpg.png.jpeg</p>
                       </div>
                     </el-form-item>
                   </el-col>
@@ -585,7 +585,6 @@ export default {
         if (
           file.type === "image/jpg" ||
           file.type === "image/png" ||
-          file.type === "image/bmp" ||
           file.type === "image/jpeg"
         ) {
           isJPG = true;
@@ -602,18 +601,23 @@ export default {
       return isJPG && isLt2M;
     },
     //图片上传失败
-    UploadErrorEvent() {
+    UploadErrorEvent(res) {
+       if (res !== "break") {
       this.$message.error("图片上传失败!");
       this.ruleForm.license_img = "";
       this.$refs.ruleForm.validateField("license_img");
+       }
     },
     //图片上传成功
-    UploadSuccessEvent(data) {
-      let res = data.url;
-      const { url } = res;
-      this.ruleForm.license_img = url;
-      this.$message.success("图片上传成功!");
-      this.$refs.ruleForm.validateField("license_img");
+    async UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.ruleForm.license_img = url;
+        this.$message.success("图片上传成功!");
+        this.$refs.ruleForm.validateField("license_img");
+      }
     },
   },
 };

src/views/sheetOrder/zxAfterSale/components/addEditForm.vue

@@ -100,7 +100,7 @@
               <i class="el-icon-plus avatar-uploader-icon"></i>
               <file-upload
                 class="Upload"
-                :accept="'.jpg,.png,.bmp,.jpeg'"
+                :accept="'.jpg,.png,.jpeg'"
                 :multiple="true"
                 :uploadcondition="beforeAvatarUpload"
                 @UploadErrorEvent="UploadErrorEvent"
@@ -449,19 +449,24 @@ export default {
       this.$refs.ruleForm.validateField("company_img");
     },
     //图片上传失败
-    UploadErrorEvent() {
+    UploadErrorEvent(res) {
+       if (res !== "break") {
       this.$message.error("图片上传失败!");
       this.$refs.ruleForm.validateField("anomalous_images");
+       }
     },
-    //图片上传成功
-    UploadSuccessEvent(data) {
-      if (data && data.url && data.url !== "break") {
-        const { url } = data.url;
+                //图片上传成功
+  async  UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
         this.ruleForm.anomalous_images.push(url);
         this.$message.success("图片上传成功!");
         this.$refs.ruleForm.validateField("anomalous_images");
       }
     },
+    
     //判断图片规格
     beforeAvatarUpload(file) {
       let isJPG = false,
@@ -470,7 +475,6 @@ export default {
         if (
           file.type === "image/jpg" ||
           file.type === "image/png" ||
-          file.type === "image/bmp" ||
           file.type === "image/jpeg"
         ) {
           isJPG = true;

src/views/sheetOrder/zxReturn/components/purchase-exam.vue

@@ -311,14 +311,18 @@ export default {
       this.$refs.ruleForm.validateField("company_img");
     },
     //图片上传失败
-    UploadErrorEvent() {
-      this.$message.error("图片上传失败!");
-      this.$refs.ruleForm.validateField("anomalous_images");
+    UploadErrorEvent(res) {
+      if (res !== "break") {
+        this.$message.error("图片上传失败!");
+        this.$refs.ruleForm.validateField("anomalous_images");
+      }
     },
     //图片上传成功
-    UploadSuccessEvent(data) {
-      if (data && data.url && data.url !== "break") {
-        const { url } = data.url;
+    async UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
         this.ruleForm.anomalous_images.push(url);
         this.$message.success("图片上传成功!");
         this.$refs.ruleForm.validateField("anomalous_images");
@@ -332,7 +336,6 @@ export default {
         if (
           file.type === "image/jpg" ||
           file.type === "image/png" ||
-          file.type === "image/bmp" ||
           file.type === "image/jpeg"
         ) {
           isJPG = true;

src/views/sheetOrder/zxoutOrder/components/addEditFormA.vue

@@ -114,7 +114,7 @@
               <i class="el-icon-plus avatar-uploader-icon"></i>
               <file-upload
                 class="Upload"
-                :accept="'.jpg,.png,.bmp,.jpeg'"
+                :accept="'.jpg,.png,.jpeg'"
                 :multiple="true"
                 :uploadcondition="beforeAvatarUpload"
                 @UploadErrorEvent="UploadErrorEvent"
@@ -375,14 +375,18 @@ export default {
       this.$refs.ruleForm.validateField("company_img");
     },
     //图片上传失败
-    UploadErrorEvent() {
+    UploadErrorEvent(res) {
+       if (res !== "break") {
       this.$message.error("图片上传失败!");
       this.$refs.ruleForm.validateField("anomalous_images");
+       }
     },
-    //图片上传成功
-    UploadSuccessEvent(data) {
-      if (data && data.url && data.url !== "break") {
-        const { url } = data.url;
+                   //图片上传成功
+  async  UploadSuccessEvent(data) {
+      const { url } = data;
+      if (url === "noToken") {
+        await this.logout();
+      } else {
         this.ruleForm.anomalous_images.push(url);
         this.$message.success("图片上传成功!");
         this.$refs.ruleForm.validateField("anomalous_images");
@@ -396,7 +400,6 @@ export default {
         if (
           file.type === "image/jpg" ||
           file.type === "image/png" ||
-          file.type === "image/bmp" ||
           file.type === "image/jpeg"
         ) {
           isJPG = true;