From 5318e76bbef5ac0273b16402e4839233876f6ae8 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期一, 24 六月 2024 19:38:30 +0800
Subject: [PATCH] fix:修复了一部分bug
---
src/views/productManage/silkRegisterForm/addPage.vue | 16 ++++++----------
vue.config.js | 6 +++---
src/views/productManage/productRegisterForm/addProductRegisterPage.vue | 37 ++++++++++++++++++++-----------------
3 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
index 8edbfb9..a710dbc 100644
--- a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
+++ b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
@@ -276,8 +276,7 @@
<el-input
v-model="ruleForm.fallingSilkBucketThree"
size="small"
- class="d-b-c-input"
- ></el-input>
+ class="d-b-c-input"></el-input>
</el-form-item>
<el-checkbox
v-model="ruleForm.selectThree"
@@ -343,8 +342,9 @@
<el-form-item label="鎬讳骇閲�" prop="total">
<div style="display: flex">
<el-input
- v-model.number="ruleForm.total"
+ :value="getTotal.toFixed(2)"
size="small"
+ disabled
></el-input>
<span class='margin_left_5px'>kg</span>
</div>
@@ -393,9 +393,7 @@
prop="pieceNumber11"
label="1"
width="60"
- align="center"
- >
-
+ align="center">
</el-table-column>
<el-table-column
prop="pieceNumber12"
@@ -408,15 +406,13 @@
prop="pieceNumber13"
label="3"
width="60"
- align="center"
- >
+ align="center">
</el-table-column>
<el-table-column
prop="pieceNumber14"
label="4"
width="60"
- align="center"
- >
+ align="center">
</el-table-column>
</el-table-column>
<el-table-column label="绗簩鍥�" align="center">
@@ -525,11 +521,10 @@
prop="oneYield1"
label="涓�鍥炲彴浜�"
width="60"
- align="center"
- >
- <template slot-scope="scope">
- {{(ruleForm.record&&ruleForm.record!=0&&scope.row.allYield1)?(scope.row.allYield1/ruleForm.record).toFixed(2):''}}
- </template>
+ align="center">
+ <template slot-scope="scope">
+ {{(ruleForm.record&&ruleForm.record!=0&&scope.row.allYield1)?(scope.row.allYield1/ruleForm.record).toFixed(2):''}}
+ </template>
</el-table-column>
<el-table-column
prop="reelingdiscount1"
@@ -624,7 +619,15 @@
props: {},
mixins: [],
components: { addProductDialog },
- computed: {},
+ computed: {
+ getTotal(){
+ let total=0;
+ this.tableData.forEach(item=>{
+ total+=parseFloat(this.getOneYield(item));
+ });
+ return total;
+ }
+ },
data() {
return {
isDeviceConnectStatus: true,
@@ -732,7 +735,7 @@
twoBack: "",
threeBack: "",
theorySilkAmount: "",
- total: "",
+ total: 0,
hourYield: "",
};
if (this.productRegisterNumber) {
diff --git a/src/views/productManage/silkRegisterForm/addPage.vue b/src/views/productManage/silkRegisterForm/addPage.vue
index ffc3189..de7a084 100644
--- a/src/views/productManage/silkRegisterForm/addPage.vue
+++ b/src/views/productManage/silkRegisterForm/addPage.vue
@@ -82,14 +82,12 @@
v-model="form.workshopObj"
placeholder="璇烽�夋嫨"
class="select-width"
- @change="getGroupNumber('workshopObj')"
- >
+ @change="getGroupNumber('workshopObj')">
<el-option
v-for="item in nameList"
:key="item.ID"
:label="item.name"
- :value="{ value: item.number, label: item.name }"
- >
+ :value="{ value: item.number, label: item.name }">
</el-option>
</el-select>
</el-form-item>
@@ -122,8 +120,7 @@
v-for="item in workshopGroupList"
:key="item"
:label="item"
- :value="item"
- >
+ :value="item">
</el-option>
</el-select>
</el-form-item>
@@ -145,9 +142,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="2" style="margin: 0 auto; text-align: center"
- >-</el-col
- >
+ <el-col :span="2" style="margin: 0 auto; text-align: center">-</el-col>
<el-col :span="11">
<el-form-item
label=""
@@ -167,7 +162,7 @@
</el-row>
</el-form-item>
<el-form-item label="杞﹀彿" prop="position" class="form-item">
- <el-input v-model.number="form.position" placeholder="璇疯緭鍏�">
+ <el-input disabled v-model.number="form.position" placeholder="璇疯緭鍏ヨ溅鍙�">
</el-input>
</el-form-item>
</el-form>
@@ -832,6 +827,7 @@
// 浜у搧鍒楄〃杈撳叆
inputContent(val, prop, row) {
this.productId = row.productId;
+ this.form.position=row.position;
this.tableData.map((item) => {
if (item.productId === row.productId) {
item[prop] = val;
diff --git a/vue.config.js b/vue.config.js
index 86a75c3..8475b1c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,8 +5,9 @@
return path.join(__dirname, dir)
}
+const serverPath='http://192.168.0.101:8008';
// 璁剧疆涓嶅弬涓庢瀯寤虹殑搴�
-const externals = {}
+const externals = {};
module.exports = {
publicPath,
lintOnSave: false,
@@ -17,8 +18,7 @@
// target: "http://192.168.20.118:8889", // http://192.168.20.119:8002 http://fai365.com:30150/
// target: "http://192.168.20.120:8008",
// target: "http://192.168.20.120:8004",
- target: "http://192.168.20.119:8008", // http://192.168.20.119:8004 http://fai365.com:30150/
-
+ target: serverPath, // http://192.168.20.119:8004 http://fai365.com:30150/
ws: true,
changeOrigin: true
}
--
Gitblit v1.8.0