From 5cdff5e062935666b06848a3b63ae9b32d114146 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 04 十一月 2023 17:35:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/basic/param/index.vue | 1
src/views/technology/structure/single-structure-form.vue | 348 ++++++++++++++++++++--------------
src/views/basic/crew/index.vue | 4
src/views/basic/staff/index.vue | 4
src/views/basic/post/index.vue | 4
src/views/technology/operation/operation-form.vue | 4
src/views/technology/structure/index.vue | 78 +++---
src/views/basic/location/location-form.vue | 106 +++++-----
src/views/basic/param/param-form.vue | 4
9 files changed, 306 insertions(+), 247 deletions(-)
diff --git a/src/views/basic/crew/index.vue b/src/views/basic/crew/index.vue
index a083b2c..32213f4 100644
--- a/src/views/basic/crew/index.vue
+++ b/src/views/basic/crew/index.vue
@@ -71,8 +71,8 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: false,
- url: ''
+ isShow: true,
+ url: '/mes/crew/upload'
},
prelang: 'operation',
options: {
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index 440da03..0316a75 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -32,12 +32,28 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐖惰妭鐐圭被鍨�" prop="pType">
+ <el-form-item label="鎵�灞炰粨搴撳垎缁�" prop="locGroup">
+ <el-select
+ v-model="dataForm.locGroup"
+ filterable
+ placeholder="璇烽�夋嫨鎵�灞炰粨搴撳垎缁�"
+ style="width:100%"
+ >
+ <el-option
+ v-for="(item, index) in this.warehouseOptions"
+ :label="item.warehouseName"
+ :value="item.id"
+ :key="index"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="鐖惰妭鐐圭被鍨�" prop="pType">
<el-input
v-model="dataForm.pType"
placeholder="鐖惰妭鐐圭被鍨�"
></el-input>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
<el-row>
@@ -95,45 +111,47 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="搴撲綅鍦板浘" prop="locMap">
- <el-input
- v-model="dataForm.locMap"
- placeholder="搴撲綅鍦板浘"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="鎵�灞炰粨搴撳垎缁�" prop="locGroup">
- <el-select
- v-model="dataForm.locGroup"
- filterable
- placeholder="璇烽�夋嫨鎵�灞炰粨搴撳垎缁�"
- style="width:100%"
- >
- <el-option
- v-for="(item, index) in this.warehouseOptions"
- :label="item.warehouseName"
- :value="item.id"
- :key="index"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
<el-form-item label="澶囨敞" prop="locRemark">
<el-input
v-model="dataForm.locRemark"
placeholder="澶囨敞"
></el-input>
</el-form-item>
+ <!-- <el-form-item label="搴撲綅鍦板浘" prop="locMap">
+ <el-input
+ v-model="dataForm.locMap"
+ placeholder="搴撲綅鍦板浘"
+ ></el-input>
+ </el-form-item> -->
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="搴撲綅鐘舵��" prop="locStatus">
+ <el-switch
+ v-model="dataForm.locStatus"
+ :active-value="1"
+ :inactive-value="0"
+ ></el-switch>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
+ <el-date-picker
+ readonly
+ style="width: 100%"
+ v-model="moment"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item
v-if="permissions.basic_has_ifs"
label="IFS搴撲綅"
@@ -153,36 +171,20 @@
>
</el-option>
</el-select>-->
- <el-cascader
+ <!-- <el-cascader
v-model="dataForm.ifsLocationDesc"
:props="locationProps"
style="width:100%"
></el-cascader>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
- <el-form-item label="搴撲綅鐘舵��" prop="locStatus">
- <el-switch
- v-model="dataForm.locStatus"
- :active-value="1"
- :inactive-value="0"
- ></el-switch>
- </el-form-item>
+
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
- <el-date-picker
- readonly
- style="width: 100%"
- v-model="moment"
- type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿"
- value-format="yyyy-MM-dd HH:mm:ss"
- >
- </el-date-picker>
- </el-form-item>
+
</el-col>
<el-col :span="12"> </el-col>
</el-row>
@@ -223,6 +225,8 @@
dataForm: {
id: 0,
factoryId: '',
+ warehouseId: null,
+ warehouseName: null,
pType: '',
locNo: '',
locName: '',
diff --git a/src/views/basic/param/index.vue b/src/views/basic/param/index.vue
index 3628f8a..a5fb42c 100644
--- a/src/views/basic/param/index.vue
+++ b/src/views/basic/param/index.vue
@@ -355,6 +355,7 @@
remote('technology_param').then((response) => {
if (response.data.code === 0) {
this.typeOptions = response.data.data
+ this.optionType = response.data.data
}
})
},
diff --git a/src/views/basic/param/param-form.vue b/src/views/basic/param/param-form.vue
index e7a113e..9245101 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/basic/post/index.vue b/src/views/basic/post/index.vue
index 8913ed4..60d9fba 100644
--- a/src/views/basic/post/index.vue
+++ b/src/views/basic/post/index.vue
@@ -58,8 +58,8 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: false,
- url: ''
+ isShow: true,
+ url: '/mes/post/upload'
},
prelang: 'operation',
options: {
diff --git a/src/views/basic/staff/index.vue b/src/views/basic/staff/index.vue
index ac172ee..67aa78d 100644
--- a/src/views/basic/staff/index.vue
+++ b/src/views/basic/staff/index.vue
@@ -38,8 +38,8 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: false,
- url: ''
+ isShow: true,
+ url: '/mes/staff/upload'
},
prelang: 'operation',
options: {
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 33e6e9a..6a7bade 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -188,7 +188,7 @@
<div class="operation-detail">
<el-tabs type="card" style="width: 100%;height: 100%">
- <el-tab-pane label="鍩虹" style="height: 100%">
+ <!-- <el-tab-pane label="鍩虹" style="height: 100%">
<el-card class="operation-capacity" header="宸ュ簭鑳藉姏">
<el-transfer
filterable
@@ -226,7 +226,7 @@
</div>
</el-upload>
</el-card>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="鍙傛暟" style="height: 100%">
<el-card class="operation-capacity" header="宸ュ簭鍙傛暟闆嗘ā鏉�">
<div slot="header">
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 0538871..0037fbb 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -47,7 +47,7 @@
multiple
>
<i class="el-icon-upload"></i>
- <div class="el-upload__text"><em>瀵煎叆瑁呭鏁版嵁</em></div>
+ <div class="el-upload__text"><em>瀵煎叆浜у搧缁撴瀯鏁版嵁</em></div>
<div class="el-upload__tip" slot="tip">
鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
type="text"
@@ -58,7 +58,7 @@
</div>
</el-upload>
</div>
- <div>
+ <!-- <div>
<el-upload
style="margin-left:8px;display: inline;"
class="upload-demo"
@@ -88,7 +88,7 @@
>
</div>
</el-upload>
- </div>
+ </div> -->
</div>
</span>
</el-dialog>
@@ -132,7 +132,7 @@
isShow: true,
url: '/mes/structure/uploadExt'
},
- prelang: 'structure',
+ prelang: 'operation',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
stripe: true, // 鏄惁涓烘枒椹汗 table
@@ -198,42 +198,42 @@
return this.bomTypeDbOptions
}
},
- // 鏇夸唬
- {
- minWidth: '120',
- prop: 'alternativeNo',
- label: '鏇夸唬',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- // 鏇夸唬鎻忚堪
- {
- minWidth: '120',
- prop: 'alternativeDesc',
- label: '鏇夸唬鎻忚堪',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // // 鏇夸唬
+ // {
+ // minWidth: '120',
+ // prop: 'alternativeNo',
+ // label: '鏇夸唬',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // // 鏇夸唬鎻忚堪
+ // {
+ // minWidth: '120',
+ // prop: 'alternativeDesc',
+ // label: '鏇夸唬鎻忚堪',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鏄惁宸插悓姝ヨ嚦ERP
- {
- minWidth: '120',
- prop: 'ifsSync',
- label: '宸插悓姝ヨ嚦ERP',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- optList: () => {
- return this.getIfsSyncOptionList()
- },
- formatter: (row, column, cellValue) => {
- return cellValue == true ? '鏄�' : '鍚�'
- }
- },
+ // {
+ // minWidth: '120',
+ // prop: 'ifsSync',
+ // label: '宸插悓姝ヨ嚦ERP',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // optList: () => {
+ // return this.getIfsSyncOptionList()
+ // },
+ // formatter: (row, column, cellValue) => {
+ // return cellValue == true ? '鏄�' : '鍚�'
+ // }
+ // },
// 鏄惁涓洪粯璁ょ粨鏋�
{
minWidth: '120',
diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue
index 834fbaf..7623507 100644
--- a/src/views/technology/structure/single-structure-form.vue
+++ b/src/views/technology/structure/single-structure-form.vue
@@ -6,56 +6,27 @@
<h2>缂栬緫-浜у搧缁撴瀯</h2>
</div>
<div class="btn-group header-right">
- <el-button title="淇濆瓨" :disabled="isSubmit" v-thinclick="`save`"
- >淇濆瓨</el-button
- >
+ <el-button title="淇濆瓨" :disabled="isSubmit" v-thinclick="`save`">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
- <div class="single-structure-basic">
- <el-form
- :inline="true"
- :model="dataForm"
- :rules="dataRule"
- ref="dataForm"
- label-width="80px"
- class="l-mes"
- >
+ <div class="single-structure-basic" style="height: 20%;">
+ <el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm" class="l-mes">
<el-row>
<el-col :span="24">
<el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input
- v-model="dataForm.partNo"
- placeholder="璇烽�夋嫨闆朵欢"
- @blur="checkPartNo()"
- >
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openPartDialog()"
- ></el-button>
+ <el-input v-model="dataForm.partNo" placeholder="璇烽�夋嫨闆朵欢" @blur="checkPartNo()">
+ <el-button slot="append" icon="el-icon-search" @click="openPartDialog()"></el-button>
</el-input>
</el-form-item>
<el-form-item label="闆朵欢鍚嶇О" prop="partName">
- <el-input
- v-model="dataForm.partName"
- placeholder="闆朵欢鍚嶇О"
- :readonly="true"
- >
+ <el-input v-model="dataForm.partName" placeholder="闆朵欢鍚嶇О" :readonly="true">
</el-input>
</el-form-item>
<el-form-item label="缁撴瀯绫诲瀷" prop="bomTypeDb">
- <el-select
- v-model="dataForm.bomTypeDb"
- placeholder="璇烽�夋嫨缁撴瀯绫诲瀷"
- style="width:100%"
- >
- <el-option
- v-for="(item, index) in bomTypeDbOptions"
- :label="item.label"
- :value="item.value"
- :key="index"
- >
+ <el-select v-model="dataForm.bomTypeDb" placeholder="璇烽�夋嫨缁撴瀯绫诲瀷" style="width:100%">
+ <el-option v-for="(item, index) in bomTypeDbOptions" :label="item.label" :value="item.value"
+ :key="index">
</el-option>
</el-select>
</el-form-item>
@@ -72,12 +43,38 @@
<el-form-item label="鐗堟湰鍙�" prop="version">
<el-input v-model="dataForm.version" disabled></el-input>
</el-form-item>
+ <el-form-item label="妯″叿缂栧彿" prop="sharpenerNo">
+ <el-input v-model="dataForm.sharpenerNo"></el-input>
+ </el-form-item>
+ <el-form-item label="姣忔ā绌存暟" prop="caveNum">
+ <el-input v-model="dataForm.caveNum"></el-input>
+ </el-form-item>
+ <el-form-item label="鍏嬮噸(kg)" prop="gramWeight">
+ <el-input v-model="dataForm.gramWeight"></el-input>
+ </el-form-item>
+ <el-form-item label="娴囧彛(kg)" prop="gateGramWeight">
+ <el-input v-model="dataForm.gateGramWeight"></el-input>
+ </el-form-item>
+ <el-form-item label="鎴愬瀷鍛ㄦ湡(h)" prop="moldingCycle">
+ <el-input v-model="dataForm.moldingCycle"></el-input>
+ </el-form-item>
+ <el-form-item label="鏈哄彴(h)" prop="machine">
+ <el-input v-model="dataForm.machine"></el-input>
+ </el-form-item>
+ <el-form-item label="鍥炴枡姣斾緥(%)" prop="scale">
+ <el-input v-model="dataForm.scale"></el-input>
+ </el-form-item>
+ <el-form-item label="鐑樻枡鏃堕棿(h)" prop="dryingTime">
+ <el-input v-model="dataForm.dryingTime"></el-input>
+ </el-form-item>
+ <el-form-item label="鐑樻枡娓╁害(鈩�)" prop="dryingTemperature">
+ <el-input v-model="dataForm.dryingTemperature"></el-input>
+ </el-form-item>
+ <el-form-item label="鍖呰淇℃伅" prop="packingInfo">
+ <el-input v-model="dataForm.packingInfo"></el-input>
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
- <el-input
- type="textarea"
- :autosize="{ minRows: 1, maxRows: 3 }"
- v-model="dataForm.remark"
- ></el-input>
+ <el-input type="textarea" :autosize="{ minRows: 1, maxRows: 3 }" v-model="dataForm.remark"></el-input>
</el-form-item>
<!-- <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync">
<span
@@ -92,57 +89,25 @@
</el-row>
</el-form>
</div>
- <div class="single-structure-detail">
+ <div class="single-structure-detail" style="height: 70%;">
<el-card class="single-structure-card" shadow="never" style="">
<div slot="header" class="clearfix">
<div style="float: left; ">
- <span>瀛愯妭鐐�</span
- ><span style="color:red;"
- >锛堟墍鏈夊瓙鑺傜偣淇濆瓨涔嬪悗锛屾墠鍙繘琛屾嫋鎷芥帓搴忥紒锛�</span
- >
+ <span>瀛愯妭鐐�</span><span style="color:red;">锛堟墍鏈夊瓙鑺傜偣淇濆瓨涔嬪悗锛屾墠鍙繘琛屾嫋鎷芥帓搴忥紒锛�</span>
</div>
<div style="float: right; margin-right: 20px">
- <el-button
- type="text"
- size="medium"
- class="blue-but"
- @click="addNode()"
- >娣诲姞
+ <el-button type="text" size="medium" class="blue-but" @click="addNode()">娣诲姞
</el-button>
</div>
</div>
- <el-table
- id="structureComponentTable"
- ref="nodeTable"
- :data="nodeList"
- :default-sort="{ prop: 'lineItemNo' }"
- height="650"
- :header-cell-style="{ color: '#999' }"
- :row-class-name="structureComponentRowClass"
- >
- <el-table-column
- prop="lineItemNo"
- label="琛岄」鍙�"
- align="center"
- width="70"
- >
+ <el-table id="structureComponentTable" ref="nodeTable" :data="nodeList" :default-sort="{ prop: 'lineItemNo' }"
+ height="650" :header-cell-style="{ color: '#999' }" :row-class-name="structureComponentRowClass">
+ <el-table-column prop="lineItemNo" label="琛岄」鍙�" align="center" width="70">
</el-table-column>
- <el-table-column
- label="娑堣�楀伐搴�"
- prop="operationName"
- align="center"
- >
+ <el-table-column label="娑堣�楀伐搴�" prop="operationName" align="center">
<template scope="scope">
- <el-input
- v-model="scope.row.operationName"
- placeholder="璇烽�夋嫨娑堣�楀伐搴�"
- v-if="scope.row.isUpdate"
- >
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openOperateDialog(scope.row)"
- ></el-button>
+ <el-input v-model="scope.row.operationName" placeholder="璇烽�夋嫨娑堣�楀伐搴�" v-if="scope.row.isUpdate">
+ <el-button slot="append" icon="el-icon-search" @click="openOperateDialog(scope.row)"></el-button>
</el-input>
<template v-if="!scope.row.isUpdate">{{
scope.row.operationName
@@ -151,47 +116,123 @@
</el-table-column>
<el-table-column label="闆朵欢鍙�" prop="partNo" align="center">
<template scope="scope">
- <el-input
- :class="customClass[scope.$index]"
- v-model="scope.row.partNo"
- placeholder="璇烽�夋嫨闆朵欢"
- v-if="scope.row.isUpdate"
- @blur="verifyPartNo(scope.row, scope.$index)"
- @focus="clearClass(scope.$index)"
- >
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openPartDialog(scope.row, scope.$index)"
- ></el-button>
+ <el-input :class="customClass[scope.$index]" v-model="scope.row.partNo" placeholder="璇烽�夋嫨闆朵欢"
+ v-if="scope.row.isUpdate" @blur="verifyPartNo(scope.row, scope.$index)"
+ @focus="clearClass(scope.$index)">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openPartDialog(scope.row, scope.$index)"></el-button>
</el-input>
<template v-if="!scope.row.isUpdate">{{
scope.row.partNo
}}</template>
</template>
</el-table-column>
- <el-table-column
- label="闆朵欢鍚嶇О"
- prop="partName"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="闆朵欢鍚嶇О" prop="partName" align="center" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="鏁伴噺" prop="qpa" align="center">
<template slot-scope="scope">
- <el-input
- size="small"
- v-model="scope.row.qpa"
- placeholder="璇峰～鍐欐暟閲�"
- v-show="scope.row.isUpdate"
- onkeyup="this.value=this.value.match(/\d+\.?\d{0,8}/);this.dispatchEvent(new Event('input'))"
- ></el-input>
+ <el-input size="small" v-model="scope.row.qpa" placeholder="璇峰～鍐欐暟閲�" v-show="scope.row.isUpdate"
+ onkeyup="this.value=this.value.match(/\d+\.?\d{0,8}/);this.dispatchEvent(new Event('input'))"></el-input>
<span v-show="!scope.row.isUpdate">{{ scope.row.qpa }}</span>
</template>
</el-table-column>
<el-table-column label="鍗曚綅" prop="unit" align="center">
</el-table-column>
+ <el-table-column label="瑙勬牸" prop="specs" align="center">
+ </el-table-column>
+ <el-table-column label="鍨嬪彿" prop="partModel" align="center">
+ </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-column label="鐩樻暟(鐩�)" prop="discNum" align="center">
<template slot-scope="scope">
<el-input
@@ -209,46 +250,21 @@
</el-table-column> -->
<el-table-column align="center" label="鎿嶄綔" width="85px">
<template slot-scope="scope">
- <el-button
- type="text"
- size="small"
- class="blue-but"
- v-if="!scope.row.isUpdate"
- @click="editNode(scope.$index, scope.row)"
- >缂栬緫</el-button
- >
- <el-button
- type="text"
- size="small"
- class="blue-but"
- v-if="scope.row.isUpdate"
- :loading="nodeSaveLoading"
- @click="addOrUpdateNode(scope.$index, scope.row)"
- >淇濆瓨</el-button
- >
- <el-button
- type="text"
- size="small"
- class="red-but"
- @click="delNode(scope.$index, scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button type="text" size="small" class="blue-but" v-if="!scope.row.isUpdate"
+ @click="editNode(scope.$index, scope.row)">缂栬緫</el-button>
+ <el-button type="text" size="small" class="blue-but" v-if="scope.row.isUpdate" :loading="nodeSaveLoading"
+ @click="addOrUpdateNode(scope.$index, scope.row)">淇濆瓨</el-button>
+ <el-button type="text" size="small" class="red-but"
+ @click="delNode(scope.$index, scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</div>
</div>
- <partDialog
- :currshowlist.sync="showPart"
- :parentSelectedObj="editNodePart"
- :parentSelectedIndex="editIndex"
- @listenToPartEvent="selectPart"
- />
- <operationDialog
- :currshowlist.sync="showOperate"
- @listenToOperationEvent="selectOperate"
- />
+ <partDialog :currshowlist.sync="showPart" :parentSelectedObj="editNodePart" :parentSelectedIndex="editIndex"
+ @listenToPartEvent="selectPart" />
+ <operationDialog :currshowlist.sync="showOperate" @listenToOperationEvent="selectOperate" />
</div>
</template>
<script>
@@ -287,7 +303,17 @@
alternativeDesc: null,
version: null,
master: false,
- ifsSync: false
+ ifsSync: false,
+ sharpenerNo: null,
+ caveNum: null,
+ gramWeight: null,
+ gateGramWeight: null,
+ moldingCycle: null,
+ machine: null,
+ scale: null,
+ dryingTime: null,
+ dryingTemperature: null,
+ packingInfo: null
},
nodeList: [],
dataRule: {
@@ -312,7 +338,7 @@
}
},
computed: {
- editable: function() {
+ editable: function () {
if (!this.dataForm.id) {
return true
}
@@ -369,6 +395,16 @@
this.dataForm.alternativeNo = resData.alternativeNo
this.dataForm.alternativeDesc = resData.alternativeDesc
this.dataForm.ifsSync = resData.ifsSync
+ this.dataForm.sharpenerNo= resData.sharpenerNo
+ this.dataForm.caveNum= resData.caveNum
+ this.dataForm.gramWeight= resData.gramWeight
+ this.dataForm.gateGramWeight= resData.gateGramWeight
+ this.dataForm.moldingCycle= resData.moldingCycle
+ this.dataForm.machine= resData.machine
+ this.dataForm.scale= resData.scale
+ this.dataForm.dryingTime= resData.ndryingTime
+ this.dataForm.dryingTemperature= resData.dryingTemperature
+ this.dataForm.packingInfo= resData.packingInfo
const components = resData.components
if (components != null && components.length > 0) {
let node
@@ -388,6 +424,18 @@
node.discNum = components[i].discNum
node.lineItemNo = components[i].lineItemNo
node.color = components[i].color
+ node.partModel=components[i].partModel
+ node.specs=components[i].specs
+ // node.sharpenerNo= components[i].sharpenerNo
+ // node.caveNum=components[i].caveNum
+ // node.gramWeight=components[i].gramWeight
+ // node.gateGramWeight=components[i].gateGramWeight
+ // node.moldingCycle=components[i].moldingCycle
+ // node.machine=components[i].machine
+ // node.scale=components[i].scale
+ // node.dryingTime=components[i].dryingTime
+ // node.dryingTemperature=components[i].dryingTemperature
+ // node.packingInfo= components[i].packingInfo
node.planningMethod = components[i].planningMethod
node.isUpdate = false
this.nodeList.push(node)
@@ -748,7 +796,7 @@
},
// 鎵归噺鏇存柊瀛愯妭鐐�
batchUpdateNodeComponent(componentList) {
- batchComponent(componentList).then((response) => {})
+ batchComponent(componentList).then((response) => { })
},
// 鍒ゆ柇鏄惁绂佺敤琛屾嫋鎷芥帓搴忥紝鍙湁鎵�鏈夎閮借繘琛宻ave涔嬪悗锛屾墠鑳借繘琛屾帓搴忋��
structureComponentRowClass() {
@@ -780,6 +828,7 @@
border: 1px solid #ddd;
box-sizing: border-box;
}
+
.single-structure-detail {
overflow: hidden;
width: 100%;
@@ -791,16 +840,20 @@
margin-top: 10px;
box-sizing: border-box;
}
+
.single-structure-card {
width: 100%;
border: 0px;
}
+
.single-structure-card .el-card__header {
border-bottom: 0px;
}
+
.single-structure-card .el-card__body {
padding-top: 0px;
}
+
.blue-but.is-disabled {
color: #aacfff;
}
@@ -808,6 +861,7 @@
.blue-but {
color: #006eff;
}
+
.red-but.is-disabled {
color: #fab6b6;
}
--
Gitblit v1.9.3