Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

13 分钟以前 0ce4aec75d87508cece9437be816e057ea433765

Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

# Conflicts:
#	multiple/config.json

 multiple/assets/favicon/DDGWfavicon.ico

 multiple/assets/favicon/DTZGfavicon.ico

 multiple/assets/favicon/XHZGfavicon.ico

 multiple/assets/favicon/XLZNfavicon.ico

 multiple/assets/logo/DDGWLogo.png

 multiple/assets/logo/DTZGLogo.png

 multiple/assets/logo/XHZGLogo.png

 multiple/assets/logo/XLZNLogo.png

 multiple/config.json

@@ -150,15 +150,50 @@
    "logo": "logo/JHJMLogo.png",
    "favicon": "favicon/JHJMfavicon.ico"
  },
  "SKJS": {
  "DDGW": {
    "env": {
      "VITE_APP_TITLE": "徐州什克金属制品有限公司",
      "VITE_BASE_API": "http://36.213.180.217:9514",
      "VITE_JAVA_API": "http://36.213.180.217:9515"
      "VITE_APP_TITLE": "河南东大高温节能材料有限公司",
      "VITE_BASE_API": "http://103.189.141.42:9001",
      "VITE_JAVA_API": "http://103.189.141.42:9002"
    },
    "logo": "logo/SKJSLogo.png",
    "favicon": "favicon/SKJSFavicon.ico"
    "logo": "logo/DDGWLogo.png",
    "favicon": "favicon/DDGWfavicon.ico"
  },
  "XHZG": {
    "env": {
      "VITE_APP_TITLE": "鹤壁欣弘重工有限公司",
      "VITE_BASE_API": "http://103.189.141.42:9001",
      "VITE_JAVA_API": "http://103.189.141.42:9002"
    },
    "logo": "logo/XHZGLogo.png",
    "favicon": "favicon/XHZGfavicon.ico"
  },
  "DTZG": {
    "env": {
      "VITE_APP_TITLE": "徐州东特重工科技有限公司",
      "VITE_BASE_API": "http://36.213.180.217:9510",
      "VITE_JAVA_API": "http://36.213.180.217:9511"
    },
    "logo": "logo/DTZGLogo.png",
    "favicon": "favicon/DTZGfavicon.ico"
  },
  "XLZN": {
    "env": {
      "VITE_APP_TITLE": "江苏旭龙智能科技有限公司",
      "VITE_BASE_API": "http://36.213.180.217:9512",
      "VITE_JAVA_API": "http://36.213.180.217:9513"
    },
    "logo": "logo/XLZNLogo.png",
    "favicon": "favicon/XLZNfavicon.ico"
  },"SKJS": {
  "env": {
    "VITE_APP_TITLE": "徐州什克金属制品有限公司",
    "VITE_BASE_API": "http://36.213.180.217:9514",
    "VITE_JAVA_API": "http://36.213.180.217:9515"
  },
  "logo": "logo/SKJSLogo.png",
  "favicon": "favicon/SKJSFavicon.ico"
},
  "YJYY": {
    "env": {
      "VITE_APP_TITLE": "徐州永佳液压设备有限公司",

 public/DDGWfavicon.ico

 src/assets/logo/logo.png

 src/views/inventoryManagement/stockManagement/Record.vue

@@ -104,11 +104,11 @@
          prop="unQualifiedLockedQuantity"
          show-overflow-tooltip
        /> -->
<!--        <el-table-column
       <el-table-column
          label="库存预警数量"
          prop="warnNum"
          show-overflow-tooltip
        />-->
        />
        <el-table-column label="备注" prop="remark" show-overflow-tooltip />
        <el-table-column
          label="最近更新时间"

 src/views/salesManagement/salesLedger/index.vue

@@ -1501,6 +1501,7 @@
    productForm.value.productModelId = p.id;
    productForm.value.specificationModel = p.model || '';
    productForm.value.unit = p.unit || '';
    fetchCurrentStock(productForm.value.productModelId);
    showProductSelectDialog.value = false;
  };
  // 获取tree子数据
@@ -2806,4 +2807,4 @@
      page-break-after: avoid;
    }
  }
</style>
</style>