Merge branch 'dev_湖南鹏创电子' of http://114.132.189.42:9002/r/product-inventory...

huminmin

6 天以前 3e2183dd0204947b9e5f37a499759720e7246b52

Merge branch 'dev_湖南鹏创电子' of http://114.132.189.42:9002/r/product-inventory-management into dev_New

 multiple/assets/favicon/AYNMico.ico

Binary files differ

 multiple/assets/favicon/BDSMico.ico

Binary files differ

 multiple/assets/favicon/BHMY.ico

Binary files differ

 multiple/assets/favicon/CJNYico.ico

Binary files differ

 multiple/assets/favicon/CMNYico.ico

Binary files differ

 multiple/assets/favicon/DHDCico.ico

Binary files differ

 multiple/assets/favicon/DHHBico.ico

Binary files differ

 multiple/assets/favicon/DZYSico.ico

Binary files differ

 multiple/assets/favicon/HCKXico.ico

Binary files differ

 multiple/assets/favicon/HCMYico.ico

Binary files differ

 multiple/assets/favicon/HGJJico.ico

Binary files differ

 multiple/assets/favicon/HHKJIco.ico

Binary files differ

 multiple/assets/favicon/HSMYico.ico

Binary files differ

 multiple/assets/favicon/HSXico.ico

Binary files differ

 multiple/assets/favicon/HXGYico.ico

Binary files differ

 multiple/assets/favicon/HXSJico.ico

Binary files differ

 multiple/assets/favicon/HYSNico.ico

Binary files differ

 multiple/assets/favicon/JLMYico.ico

Binary files differ

 multiple/assets/favicon/JLSNico.ico

Binary files differ

 multiple/assets/favicon/JMSLico.ico

Binary files differ

 multiple/assets/favicon/JSMYico.ico

Binary files differ

 multiple/assets/favicon/JSYNYico.ico

Binary files differ

 multiple/assets/favicon/JYHJico.ico

Binary files differ

 multiple/assets/favicon/JZYJico.ico

Binary files differ

 multiple/assets/favicon/LQMico.ico

Binary files differ

 multiple/assets/favicon/MKZSico.ico

Binary files differ

 multiple/assets/favicon/MXSCIco.ico

Binary files differ

 multiple/assets/favicon/NYDLico.ico

Binary files differ

 multiple/assets/favicon/PCDZico.ico

 multiple/assets/favicon/PHMKico.ico

Binary files differ

 multiple/assets/favicon/QLMCico.ico

Binary files differ

 multiple/assets/favicon/RTSWico.ico

Binary files differ

 multiple/assets/favicon/RZNY.ico

Binary files differ

 multiple/assets/favicon/TJKHico.ico

Binary files differ

 multiple/assets/favicon/TJXM.ico

Binary files differ

 multiple/assets/favicon/TYMKico.ico

Binary files differ

 multiple/assets/favicon/WDSYico.ico

Binary files differ

 multiple/assets/favicon/XYHBico.ico

Binary files differ

 multiple/assets/favicon/ZDXMico.ico

Binary files differ

 multiple/assets/favicon/ZQHXico.ico

Binary files differ

 multiple/assets/favicon/ZYRQico.ico

Binary files differ

 multiple/assets/favicon/favicon.ico

Binary files differ

 multiple/assets/logo/AYNMLogo.png

Binary files differ

 multiple/assets/logo/BDSMLogo.png

Binary files differ

 multiple/assets/logo/BHMYLogo.png

Binary files differ

 multiple/assets/logo/CJNYLogo.png

Binary files differ

 multiple/assets/logo/CMNYLogo.png

Binary files differ

 multiple/assets/logo/DHDCLogo.png

Binary files differ

 multiple/assets/logo/DHHBLogo.png

Binary files differ

 multiple/assets/logo/DZYSLogo.png

Binary files differ

 multiple/assets/logo/HCKXLogo.png

Binary files differ

 multiple/assets/logo/HCMYLogo.png

Binary files differ

 multiple/assets/logo/HGJJLogo.png

Binary files differ

 multiple/assets/logo/HHKJLogo.png

Binary files differ

 multiple/assets/logo/HSMYLogo.png

Binary files differ

 multiple/assets/logo/HSXLogo.png

Binary files differ

 multiple/assets/logo/HXGYLogo.png

Binary files differ

 multiple/assets/logo/HXSJLogo.png

Binary files differ

 multiple/assets/logo/HYSNLogo.png

Binary files differ

 multiple/assets/logo/JLMYLogo.png

Binary files differ

 multiple/assets/logo/JLSNLogo.png

Binary files differ

 multiple/assets/logo/JMSLLogo.png

Binary files differ

 multiple/assets/logo/JSMYLogo.png

Binary files differ

 multiple/assets/logo/JSYNYLogo.png

Binary files differ

 multiple/assets/logo/JYHJLogo.png

Binary files differ

 multiple/assets/logo/JZYJLogo.png

Binary files differ

 multiple/assets/logo/LCLogo.png

Binary files differ

 multiple/assets/logo/LQMLogo.png

Binary files differ

 multiple/assets/logo/MKZSLogo.png

Binary files differ

 multiple/assets/logo/MXSCLogo.png

Binary files differ

 multiple/assets/logo/NYDLLogo.png

Binary files differ

 multiple/assets/logo/PCDZLogo.png

 multiple/assets/logo/PHMKLogo.png

Binary files differ

 multiple/assets/logo/QLMCLogo.png

Binary files differ

 multiple/assets/logo/RTSWLogo.png

Binary files differ

 multiple/assets/logo/RZNYLogo.png

Binary files differ

 multiple/assets/logo/TJKHLogo.png

Binary files differ

 multiple/assets/logo/TJXMLogo.png

Binary files differ

 multiple/assets/logo/TYMKLogo.png

Binary files differ

 multiple/assets/logo/WDSYLogo.png

Binary files differ

 multiple/assets/logo/XYHBLogo.png

Binary files differ

 multiple/assets/logo/ZDXMLogo.png

Binary files differ

 multiple/assets/logo/ZGLTLogo.png

Binary files differ

 multiple/assets/logo/ZQHXLogo.png

Binary files differ

 multiple/assets/logo/ZYRQLogo.png

Binary files differ

 multiple/assets/logo/logo.png

Binary files differ

 multiple/assets/logo/ÄÏͨÔÆ´Ó¹¤Òµ»¥ÁªÍøÓÐÏÞ¹«Ë¾.png

Binary files differ

 multiple/assets/logo/ÐÂÀ£¨½­ËÕ£©Êý×ֿƼ¼ÓÐÏÞ¹«Ë¾.png

Binary files differ

 multiple/assets/logo/оµ¼Èí¼þ£¨½­ËÕ£©ÓÐÏÞ¹«Ë¾.png

Binary files differ

 multiple/assets/screen/AYNMView.png

Binary files differ

 multiple/assets/screen/BDSMView.png

Binary files differ

 multiple/assets/screen/DHDCView.png

Binary files differ

 multiple/assets/screen/DHHBView.png

Binary files differ

 multiple/assets/screen/DZYSView.png

Binary files differ

 multiple/assets/screen/HCMYView.png

Binary files differ

 multiple/assets/screen/HGJJView.png

Binary files differ

 multiple/assets/screen/HHKJView.png

Binary files differ

 multiple/assets/screen/HSMYView.png

Binary files differ

 multiple/assets/screen/HSXView.png

Binary files differ

 multiple/assets/screen/HXGYView.png

Binary files differ

 multiple/assets/screen/HXSJView.png

Binary files differ

 multiple/assets/screen/HYSNView.png

Binary files differ

 multiple/assets/screen/JLSNView.png

Binary files differ

 multiple/assets/screen/JMSLView.png

Binary files differ

 multiple/assets/screen/JZYJView.png

Binary files differ

 multiple/assets/screen/LQMView.png

Binary files differ

 multiple/assets/screen/MKZSView.png

Binary files differ

 multiple/assets/screen/MXSCBack.png

Binary files differ

 multiple/assets/screen/NYDLView.png

Binary files differ

 multiple/assets/screen/PCDZView.png

 multiple/assets/screen/PHMKView.png

Binary files differ

 multiple/assets/screen/QLMCView.png

Binary files differ

 multiple/assets/screen/RTSWView.png

Binary files differ

 multiple/assets/screen/RZNYView.png

Binary files differ

 multiple/assets/screen/TJKHView.png

Binary files differ

 multiple/assets/screen/TJXMView.png

Binary files differ

 multiple/assets/screen/TYMKView.png

Binary files differ

 multiple/assets/screen/WDSYView.png

Binary files differ

 multiple/assets/screen/XYHBView.png

Binary files differ

 multiple/assets/screen/ZDXMView.png

Binary files differ

 multiple/assets/screen/ZQHXView.png

Binary files differ

 multiple/assets/screen/ZYRQView.png

Binary files differ

 multiple/config.json

@@ -3,19 +3,19 @@
    "env": {
      "VITE_APP_TITLE": "芯导云（管理信息系统）"
    },
    "screen": "screen/JZYJView.png",
    "logo": "logo/HYSNLogo.png",
    "favicon": "favicon/HYSNico.ico"
    "screen": "screen/PCDZView.png",
    "logo": "logo/PCDZLogo.png",
    "favicon": "favicon/PCDZico.ico"
  },
  "TEST": {
  "PCDZ": {
    "env": {
      "VITE_APP_TITLE": "中小企业数字化转型二级套餐包",
      "VITE_APP_TITLE": "鹏创电子信息管理",
      "VITE_BASE_API": "http://1.15.17.182:9003",
      "VITE_JAVA_API": "http://1.15.17.182:9002"
    },
    "screen": "screen/HYSNView.png",
    "logo": "logo/ZGLTLogo.png",
    "favicon": "favicon/favicon.ico"
    "screen": "screen/PCDZView.png",
    "logo": "logo/PCDZLogo.png",
    "favicon": "favicon/PCDZico.ico"
  },
  "screen": "/src/assets/images/login-background.png",
  "logo": "/src/assets/logo/logo.png",

 src/views/basicData/supplierManage/components/BlacklistTab.vue

@@ -162,6 +162,16 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商类型：" prop="supplierType">
              <el-select v-model="form.supplierType" placeholder="请选择" clearable>
                <el-option label="甲" value="甲" />
                <el-option label="乙" value="乙" />
                <el-option label="丙" value="丙" />
                <el-option label="丁" value="丁" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="是否白名单：" prop="isWhite">
              <el-select v-model="form.isWhite" placeholder="请选择" clearable>
                <el-option label="是" :value="0" />
@@ -248,6 +258,11 @@
    label: "供应商名称",
    prop: "supplierName",
    width: 250,
  },
  {
    label: "供应商类型",
    prop: "supplierType",
    width: 120,
  },
  {
    label: "纳税人识别号",
@@ -346,6 +361,7 @@
    contactUserPhone: "",
    maintainUserId: "",
    maintainTime: "",
    supplierType: "",
    isWhite: "",
  },
  rules: {
@@ -361,6 +377,7 @@
    contactUserPhone: [{ required: false, message: "请输入", trigger: "blur" }],
    maintainUserId: [{ required: false, message: "请选择", trigger: "change" }],
    maintainTime: [{ required: false, message: "请选择", trigger: "change" }],
    supplierType: [{ required: true, message: "请选择供应商类型", trigger: "change" }],
  },
});
const { searchForm, form, rules } = toRefs(data);

 src/views/basicData/supplierManage/components/HomeTab.vue

@@ -168,6 +168,16 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商类型：" prop="supplierType">
              <el-select v-model="form.supplierType" placeholder="请选择" clearable>
                <el-option label="甲" value="甲" />
                <el-option label="乙" value="乙" />
                <el-option label="丙" value="丙" />
                <el-option label="丁" value="丁" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="是否白名单：" prop="isWhite">
              <el-select v-model="form.isWhite" placeholder="请选择" clearable>
                <el-option label="是" :value="0" />
@@ -254,6 +264,11 @@
    label: "供应商名称",
    prop: "supplierName",
    width: 250,
  },
  {
    label: "供应商类型",
    prop: "supplierType",
    width: 120,
  },
  {
    label: "纳税人识别号",
@@ -352,6 +367,7 @@
    contactUserPhone: "",
    maintainUserId: "",
    maintainTime: "",
    supplierType: "",
    isWhite: "",
  },
  rules: {
@@ -367,6 +383,7 @@
    contactUserPhone: [{ required: false, message: "请输入", trigger: "blur" }],
    maintainUserId: [{ required: false, message: "请选择", trigger: "change" }],
    maintainTime: [{ required: false, message: "请选择", trigger: "change" }],
    supplierType: [{ required: true, message: "请选择供应商类型", trigger: "change" }],
  },
});
const { searchForm, form, rules } = toRefs(data);

 src/views/procurementManagement/procurementLedger/index.vue

@@ -233,7 +233,7 @@
                <el-option v-for="item in supplierList"
                           :key="item.id"
                           :label="item.supplierName"
                           :value="item.id" />
                                                     :value="item.id" >{{item.supplierName + '---' + item.supplierType}}</el-option>
              </el-select>
            </el-form-item>
          </el-col>