From f6afb0b97096e7c0d60226c6de4c29505942f129 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 07 十一月 2023 18:31:12 +0800
Subject: [PATCH] modified: src/views/basic/param/index.vue modified: src/views/basic/param/param-form.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/structure/single-structure-form.vue
---
src/views/basic/param/index.vue | 6
src/views/technology/structure/single-structure-form.vue | 2
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++-
src/views/basic/param/param-form.vue | 4
4 files changed, 211 insertions(+), 13 deletions(-)
diff --git a/src/views/basic/param/index.vue b/src/views/basic/param/index.vue
index a5fb42c..5754c52 100644
--- a/src/views/basic/param/index.vue
+++ b/src/views/basic/param/index.vue
@@ -5,12 +5,12 @@
<el-row>
<el-col :span="4">
<el-form-item label="鍙傛暟椤�:">
- <el-input clearable style="width:200px" v-model="searchForm.param" placeholder="鍙傛暟椤�"></el-input>
+ <el-input clearable style="width: 100%;" v-model="searchForm.param" placeholder="鍙傛暟椤�"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="5">
<el-form-item label="鍙傛暟缂栧彿:">
- <el-input clearable style="width:200px" v-model="searchForm.code" placeholder="鍙傛暟缂栧彿"></el-input>
+ <el-input clearable style="width: 100%;" v-model="searchForm.code" placeholder="鍙傛暟缂栧彿"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
diff --git a/src/views/basic/param/param-form.vue b/src/views/basic/param/param-form.vue
index 9245101..e7a113e 100644
--- a/src/views/basic/param/param-form.vue
+++ b/src/views/basic/param/param-form.vue
@@ -19,7 +19,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍙傛暟绫诲瀷" prop="type">
+ <!-- <el-form-item label="鍙傛暟绫诲瀷" prop="type">
<el-select
v-model="dataForm.type"
filterable
@@ -64,7 +64,7 @@
</el-form-item>
<el-form-item label="鍗曚綅" prop="unit">
<el-input v-model="dataForm.unit" placeholder="鍗曚綅"></el-input>
- </el-form-item>
+ </el-form-item> -->
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index 760d492..9ac0a9d 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -74,7 +74,7 @@
>
</el-input>
</el-form-item>
-
+<!--
<el-form-item label="鏇夸唬鍙�" prop="alternativeNo">
<el-input
v-model="treeForm.alternativeNo"
@@ -110,7 +110,7 @@
placeholder="鐗规��1"
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -151,10 +151,98 @@
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" width="100">
</el-table-column>
- <el-table-column prop="discNum" label="鐩樻暟(鐩�)" width="100">
- </el-table-column>
<el-table-column prop="operationName" label="娑堣�楀伐搴�">
</el-table-column>
+ <el-table-column label="纾ㄥ叿缂栧彿" prop="sharpenerNo" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.sharpenerNo" placeholder="璇峰～鍐欑（鍏风紪鍙�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.sharpenerNo
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="姣忔ā绌存暟" prop="caveNum" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.caveNum" placeholder="璇峰～鍐欐瘡妯＄┐鏁�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.caveNum
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍏嬮噸(kg)" prop="gramWeight" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.gramWeight" placeholder="璇峰～鍐欏厠閲�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.gramWeight
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="娴囧彛鍏嬮噸(kg)" prop="gateGramWeight" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.gateGramWeight" placeholder="璇峰～鍐欐祰鍙ｅ厠閲�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.gateGramWeight
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎴愬瀷鍛ㄦ湡(h)" prop="moldingCycle" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.moldingCycle" placeholder="璇峰～鍐欐垚鍨嬪懆鏈�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.moldingCycle
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈哄彴(t)" prop="machine" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.machine" placeholder="璇峰～鍐欐満鍙�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.machine
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍥炴枡姣斾緥(%)" prop="scale" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.scale" placeholder="璇峰～鍐欏洖鏂欐瘮渚�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.scale
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐑樻枡鏃堕棿(h)" prop="dryingTime" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.dryingTime" placeholder="璇峰～鍐欑儤鏂欐椂闂�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.dryingTime
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐑樻枡娓╁害(鈩�)" prop="dryingTemperature" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.dryingTemperature" placeholder="璇峰～鍐欑儤鏂欐俯搴�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.dryingTemperature
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍖呰淇℃伅" prop="packingInfo" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.packingInfo" placeholder="璇峰～鍐欏寘瑁呬俊鎭�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.packingInfo
+ }}</span>
+ </template>
+ </el-table-column>
</el-table>
</div>
<div class="completeProductStructure-queryPreview"></div>
@@ -192,13 +280,103 @@
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" width="100">
</el-table-column>
- <el-table-column prop="discNum" label="鐩樻暟(鐩�)" width="100">
+ <!-- <el-table-column prop="discNum" label="鐩樻暟(鐩�)" width="100">
<template slot-scope="scope">
{{ scope.row.discNum || 1 }}
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="operationName" label="娑堣�楀伐搴�">
</el-table-column>
+ <el-table-column label="纾ㄥ叿缂栧彿" prop="sharpenerNo" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.sharpenerNo" placeholder="璇峰～鍐欑（鍏风紪鍙�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.sharpenerNo
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="姣忔ā绌存暟" prop="caveNum" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.caveNum" placeholder="璇峰～鍐欐瘡妯＄┐鏁�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.caveNum
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍏嬮噸(kg)" prop="gramWeight" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.gramWeight" placeholder="璇峰～鍐欏厠閲�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.gramWeight
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="娴囧彛鍏嬮噸(kg)" prop="gateGramWeight" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.gateGramWeight" placeholder="璇峰～鍐欐祰鍙ｅ厠閲�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.gateGramWeight
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎴愬瀷鍛ㄦ湡(h)" prop="moldingCycle" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.moldingCycle" placeholder="璇峰～鍐欐垚鍨嬪懆鏈�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.moldingCycle
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈哄彴(t)" prop="machine" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.machine" placeholder="璇峰～鍐欐満鍙�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.machine
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍥炴枡姣斾緥(%)" prop="scale" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.scale" placeholder="璇峰～鍐欏洖鏂欐瘮渚�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.scale
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐑樻枡鏃堕棿(h)" prop="dryingTime" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.dryingTime" placeholder="璇峰～鍐欑儤鏂欐椂闂�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.dryingTime
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐑樻枡娓╁害(鈩�)" prop="dryingTemperature" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.dryingTemperature" placeholder="璇峰～鍐欑儤鏂欐俯搴�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.dryingTemperature
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍖呰淇℃伅" prop="packingInfo" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.packingInfo" placeholder="璇峰～鍐欏寘瑁呬俊鎭�"
+ v-show="scope.row.isUpdate"></el-input>
+ <span v-show="!scope.row.isUpdate">{{
+ scope.row.packingInfo
+ }}</span>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
@@ -420,6 +598,16 @@
unit: org.unit,
color: org.color,
planningMethod: org.planningMethod,
+ sharpenerNo: org.sharpenerNo,
+ caveNum:org.caveNum,
+ gramWeight:org.gramWeight,
+ gateGramWeight:org.gateGramWeight,
+ moldingCycle:org.moldingCycle,
+ machine:org.machine,
+ scale:org.scale,
+ dryingTime:org.dryingTime,
+ dryingTemperature:org.dryingTemperature,
+ packingInfo: org.packingInfo,
children: haveChildren ? org.children.map((i) => mapTree(i)) : []
}
}
@@ -472,7 +660,6 @@
newObj.alternativeDesc = this.treeForm.alternativeDesc
newObj.bomTypeDb = this.treeForm.bomTypeDb
const gxqTree = this.preViewData.map((org) => mapTree(org))
-
newObj.tree = gxqTree[0]
addObj(newObj)
.then((response) => {
@@ -653,6 +840,17 @@
copyNoParent.operationId = noParent.operationId
copyNoParent.operationName = noParent.operationName
+ copyNoParent.sharpenerNo= noParent.sharpenerNo
+ copyNoParent.caveNum=noParent.caveNum
+ copyNoParent.gramWeight=noParent.gramWeight
+ copyNoParent.gateGramWeight=noParent.gateGramWeight
+ copyNoParent.moldingCycle=noParent.moldingCycle
+ copyNoParent.machine=noParent.machine
+ copyNoParent.scale=noParent.scale
+ copyNoParent.dryingTime=noParent.dryingTime
+ copyNoParent.dryingTemperature=noParent.dryingTemperature
+ copyNoParent.packingInfo= noParent.packingInfo
+
copyNoParent.discNum = noParent.discNum
copyNoParent.qpa = noParent.qpa
copyNoParent.originalQpa = noParent.originalQpa
diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue
index 7623507..b26a3a4 100644
--- a/src/views/technology/structure/single-structure-form.vue
+++ b/src/views/technology/structure/single-structure-form.vue
@@ -10,7 +10,7 @@
</div>
</div>
<div class="page-main">
- <div class="single-structure-basic" style="height: 20%;">
+ <div class="single-structure-basic" style="height: 22%;">
<el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm" class="l-mes">
<el-row>
<el-col :span="24">
--
Gitblit v1.9.3