wengyuwen преди 4 години
родител
ревизия
ac31a63099
променени са 8 файла, в които са добавени 80 реда и са изтрити 78 реда
  1. 2 2
      package.json
  2. BIN
      public/favicon.ico
  3. BIN
      src/assets/logo/logo.png
  4. 1 1
      src/layout/components/Sidebar/Logo.vue
  5. 1 1
      src/settings.js
  6. 1 1
      src/views/login.vue
  7. 72 70
      src/views/warehouseBusiness/inStock/index.vue
  8. 3 3
      vue.config.js

+ 2 - 2
package.json

@@ -1,8 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.2.1",
-  "description": "大木仓储管理系统",
-  "author": "大木",
+  "description": "途宝仓储管理系统",
+  "author": "途宝",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",

BIN
public/favicon.ico


BIN
src/assets/logo/logo.png


+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -47,7 +47,7 @@ export default {
   },
   data() {
     return {
-      title: "大木仓储管理系统",
+      title: "途宝仓储管理系统",
       logo: logoImg,
     };
   },

+ 1 - 1
src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '大木仓储管理系统',
+  title: '途宝仓储管理系统',
 
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light

+ 1 - 1
src/views/login.vue

@@ -67,7 +67,7 @@ export default {
   data() {
     return {
       codeUrl: "",
-      company_name:'大木',
+      company_name:'途宝',
       cookiePassword: "",
       loginForm: {
         username: "admin",

+ 72 - 70
src/views/warehouseBusiness/inStock/index.vue

@@ -432,7 +432,7 @@
                 style="width: 80%"
                 type="date"
                 :disabled="browseStatus || formBrowseStatus"
-                @change="changefBsdate"
+
                 value-format="timestamp"
                 placeholder="入库日期"
               >
@@ -4013,51 +4013,53 @@ export default {
     // },
 
     // 导入付款信息
-    whgenlegData() {
-      if (this.dialogWhgenlegList.length === 0) {
-        this.$message({
-          message: "请选择需要导入的数据",
-          type: "warning",
-        });
-      } else {
-        for (let whgen in this.dialogWhgenlegList) {
-          let feeId = this.dialogWhgenlegList[whgen].feeFId;
-          getFees(feeId).then((response) => {
-            console.log(response)
-            this.fWbuOptions.push(response.data);
-          });
-          let qty = 1;
-          if (this.dialogWhgenlegList[whgen].fFeeUnitid === 1) {
-            qty = this.fQty
-          } else if (this.dialogWhgenlegList[whgen].fFeeUnitid === 2) {
-            qty = (this.fGrossweight/1000).toFixed(2)
-          } else if (this.dialogWhgenlegList[whgen].fFeeUnitid === 3) {
-            qty = (this.fNetweight/1000).toFixed(2)
-          } else if (this.dialogWhgenlegList[whgen].fFeeUnitid === 4) {
-            qty = this.fVolumn
-          }
-          // qty=(qty/1000).toFixed(2);
-          let fAmount = parseFloat(Number(this.dialogWhgenlegList[whgen].fPrice) * Number(qty)).toFixed(2)
+    // whgenlegData() {
+    //   if (this.dialogWhgenlegList.length === 0) {
+    //     this.$message({
+    //       message: "请选择需要导入的数据",
+    //       type: "warning",
+    //     });
+    //   } else {
+    //     for (let whgen in this.dialogWhgenlegList) {
+    //       let feeId = this.dialogWhgenlegList[whgen].feeFId;
+    //       getFees(feeId).then((response) => {
+    //         console.log(response)
+    //         this.fWbuOptions.push(response.data);
+    //       });
+    //       let qty = 1;
+    //       if (this.dialogWhgenlegList[whgen].fFeeUnitid === 1) {
+    //         qty = this.fQty
+    //       } else if (this.dialogWhgenlegList[whgen].fFeeUnitid === 2) {
+    //         qty = (this.fGrossweight/1000).toFixed(2)
+    //       } else if (this.dialogWhgenlegList[whgen].fFeeUnitid === 3) {
+    //         qty = (this.fNetweight/1000).toFixed(2)
+    //       } else if (this.dialogWhgenlegList[whgen].fFeeUnitid === 4) {
+    //         qty = this.fVolumn
+    //       }
+    //       // qty=(qty/1000).toFixed(2);
+    //       let fAmount = parseFloat(Number(this.dialogWhgenlegList[whgen].fPrice) * Number(qty)).toFixed(2)
+    //
+    //       this.warehouseDrList.push({
+    //         fQty: qty,
+    //         fCorpid: this.dialogWhgenlegList[whgen].fCorpid,
+    //         fFeeid: feeId,
+    //         fFeeunitid: this.dialogWhgenlegList[whgen].fFeeUnitid + '',
+    //         fUnitprice: this.dialogWhgenlegList[whgen].fPrice,
+    //         fCurrency: 'RMB',
+    //         fExrate: 1,
+    //         fAmount: fAmount,
+    //         fTaxrate: this.fTaxrate,
+    //         fMblno:this.form.fMblno,
+    //         fProductName:this.form.fProductName,
+    //         fMarks:this.form.fMarks,
+    //         fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
+    //       })
+    //     }
+    //     this.warehousingagreement = false;
+    //   }
+    // },
 
-          this.warehouseDrList.push({
-            fQty: qty,
-            fCorpid: this.dialogWhgenlegList[whgen].fCorpid,
-            fFeeid: feeId,
-            fFeeunitid: this.dialogWhgenlegList[whgen].fFeeUnitid + '',
-            fUnitprice: this.dialogWhgenlegList[whgen].fPrice,
-            fCurrency: 'RMB',
-            fExrate: 1,
-            fAmount: fAmount,
-            fTaxrate: this.fTaxrate,
-            fMblno:this.form.fMblno,
-            fProductName:this.form.fProductName,
-            fMarks:this.form.fMarks,
-            fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
-          })
-        }
-        this.warehousingagreement = false;
-      }
-    },
+    //导入收付款信息明细
     zhgenlegData() {
       if (this.dialogWhgenlegList.length === 0) {
         this.$message({
@@ -4133,25 +4135,25 @@ export default {
       return this.selectDictLabel(this.businessTypeOption, row.fBusinessType);
     },
     // 贸易方式(数据字典),对���t_trademodels 字典翻译
-    fTrademodeidFormat(row, column) {
-      return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
-    },
+    // fTrademodeidFormat(row, column) {
+    //   return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
+    // },
     // 计费单位(数据字典),下拉选择毛重或净重字典翻译
-    fFeetunitFormat(row, column) {
-      return this.selectDictLabel(this.fFeetunitOptions, row.fFeetunit);
-    },
+    // fFeetunitFormat(row, column) {
+    //   return this.selectDictLabel(this.fFeetunitOptions, row.fFeetunit);
+    // },
     // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典翻译
-    fIfweighFormat(row, column) {
-      return this.selectDictLabel(this.fIfweighOptions, row.fIfweigh);
-    },
+    // fIfweighFormat(row, column) {
+    //   return this.selectDictLabel(this.fIfweighOptions, row.fIfweigh);
+    // },
     // 编号字典翻译
-    fStltypeidFormat(row, column) {
-      return this.selectDictLabel(this.fStltypeOptions, row.fStltypeid);
-    },
+    // fStltypeidFormat(row, column) {
+    //   return this.selectDictLabel(this.fStltypeOptions, row.fStltypeid);
+    // },
     // 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典翻译
-    fIfpledgeFormat(row, column) {
-      return this.selectDictLabel(this.fIfpledgeOptions, row.fIfpledge);
-    },
+    // fIfpledgeFormat(row, column) {
+    //   return this.selectDictLabel(this.fIfpledgeOptions, row.fIfpledge);
+    // },
     // 取消按钮
     cancel() {
       this.open = false
@@ -4614,15 +4616,15 @@ export default {
         );
       }
     },
-    changefBsdate(row) {
-      this.$set(this.form, 'fChargedate', row)
-      if (this.dataList.length > 0) {
-        for (var i = 0; i < this.dataList.length; i++) {
-          this.$set(this.dataList[i], "fBsdate", row);
-        }
-      }
-    },
-    // 入
+    // changefBsdate(row) {
+    //   this.$set(this.form, 'fChargedate', row)
+    //   if (this.dataList.length > 0) {
+    //     for (var i = 0; i < this.dataList.length; i++) {
+    //       this.$set(this.dataList[i], "fBsdate", row);
+    //     }
+    //   }
+    // },
+    // 入库确认
     creditClick() {
       this.$refs['form'].validate((valid) => {
         for (let warehouseCr in this.Printinglist) {
@@ -4911,7 +4913,7 @@ export default {
         }
       }
     },
-    // 卸货按钮
+    // 叫车进场按钮
     discharge() {
       if (this.Printinglist.length > 0) {
 

+ 3 - 3
vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '大木仓储管理系统' // 标题
+const name = defaultSettings.title || '途宝仓储管理系统' // 标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.137.1:9010`,
-        //  target: `http://engineering.echepei.com:9010/`,
+        // target: `http://192.168.137.1:9010`,
+         target: `http://121.36.212.131:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''