From 135b5b2e497514dc4456e33b0db0fe5e7fa4e62f Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 11 八月 2025 09:11:19 +0800
Subject: [PATCH] 现场问题处理
---
src/views/tms/modules/verification/JSelectTools.vue | 207 +++++++++
src/views/tms/modules/baseTools/ParaBladeModal.vue | 122 ++++-
src/views/tms/modules/toolsClassify/ToolsClassifyListLeft.vue | 11
src/views/tms/modules/baseTools/ToolsConfigPropertyList.vue | 3
src/views/tms/modules/baseTools/ParaMillToolModal.vue | 99 +++-
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue | 86 +++
src/views/tms/modules/verification/ToolVerificationRecordModal.vue | 236 ++++++++-
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue | 101 +++-
/dev/null | 154 -------
src/views/tms/modules/baseTools/ParaThreadingToolList.vue | 5
src/views/tms/modules/baseTools/BaseToolsListRight.vue | 31
src/views/tms/ToolVerificationList.vue | 36 -
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue | 90 +++
src/views/tms/modules/baseTools/ParaCommonToolModal.vue | 21
src/views/tms/modules/toolLedger/ToolLedgerListRight.vue | 10
src/views/tms/ToolVerificationRecordList.vue | 26
src/views/tms/modules/baseTools/ParaTurningToolsList.vue | 5
src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue | 4
src/views/tms/modules/baseTools/ParaBladeList.vue | 5
src/views/tms/modules/baseTools/ParaHoleToolsList.vue | 5
src/views/tms/modules/baseTools/ParaMillToolList.vue | 5
src/views/tms/modules/baseTools/ToolsConfigPropertyModal.vue | 19
22 files changed, 860 insertions(+), 421 deletions(-)
diff --git a/src/views/tms/ToolVerificationList.vue b/src/views/tms/ToolVerificationList.vue
index 6a034f9..a643dce 100644
--- a/src/views/tms/ToolVerificationList.vue
+++ b/src/views/tms/ToolVerificationList.vue
@@ -33,9 +33,6 @@
<!-- 鏌ヨ鍖哄煙-END -->
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- </div>
<!-- table鍖哄煙-begin -->
<div>
@@ -53,25 +50,6 @@
:rowSelection="null"
class="j-table-force-nowrap"
@change="handleTableChange">
-
- <span slot="action" slot-scope="text, record">
- <a @click="handleDetail(record)">璇︽儏</a>
-
- <a-divider type="vertical" />
- <a-dropdown>
- <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a @click="handleEdit(record)">缂栬緫</a>
- </a-menu-item>
- <a-menu-item>
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
- </span>
</a-table>
</div>
@@ -113,7 +91,7 @@
{
title:'鍞竴缂栫爜',
align:"center",
- dataIndex: 'toolId',
+ dataIndex: 'onlyCode',
},
{
title:'閲忓叿鍚嶇О',
@@ -123,7 +101,7 @@
{
title:'瑙勬牸',
align:"center",
- dataIndex: 'model'
+ dataIndex: 'toolModel'
},
{
title:'璁￠噺鍙�',
@@ -140,17 +118,9 @@
align:"center",
dataIndex: 'nextVerificationDate'
},
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' }
- }
],
url: {
- list: "/tms/toolVerificationRecord/list",
+ list: "/tms/toolVerificationRecord/queryPageList",
delete: "/tms/toolVerificationRecord/delete",
deleteBatch: "/tms/toolVerificationRecord/deleteBatch",
exportXlsUrl: "/tms/toolVerificationRecord/exportXls",
diff --git a/src/views/tms/ToolVerificationRecordList.vue b/src/views/tms/ToolVerificationRecordList.vue
index 06e67a4..76d4c4d 100644
--- a/src/views/tms/ToolVerificationRecordList.vue
+++ b/src/views/tms/ToolVerificationRecordList.vue
@@ -117,7 +117,7 @@
{
title:'鍞竴缂栫爜',
align:"center",
- dataIndex: 'toolId',
+ dataIndex: 'onlyCode',
},
{
title:'閲忓叿鍚嶇О',
@@ -127,7 +127,7 @@
{
title:'瑙勬牸',
align:"center",
- dataIndex: 'model'
+ dataIndex: 'toolModel'
},
{
title:'璁￠噺鍙�',
@@ -149,16 +149,16 @@
align:"center",
dataIndex: 'personResponsible'
},
- {
- title:'鍒涘缓浜�',
- align:"center",
- dataIndex: 'createBy'
- },
- {
- title:'鍒涘缓鏃堕棿',
- align:"center",
- dataIndex: 'createTime'
- },
+ // {
+ // title:'鍒涘缓浜�',
+ // align:"center",
+ // dataIndex: 'createBy'
+ // },
+ // {
+ // title:'鍒涘缓鏃堕棿',
+ // align:"center",
+ // dataIndex: 'createTime'
+ // },
{
title: '鎿嶄綔',
dataIndex: 'action',
@@ -169,7 +169,7 @@
}
],
url: {
- list: "/tms/toolVerificationRecord/list",
+ list: "/tms/toolVerificationRecord/queryPageList",
delete: "/tms/toolVerificationRecord/delete",
deleteBatch: "/tms/toolVerificationRecord/deleteBatch",
exportXlsUrl: "/tms/toolVerificationRecord/exportXls",
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index b2285a4..e8ae474 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -406,22 +406,23 @@
this.$bus.$emit('queryTreeData') //鍒锋柊宸︿晶鏍�
},
- onSelectChange(selectedRowKeys) {
+ onSelectChange(selectedRowKeys,selectionRows) {
this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectionRows;
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.paraTypeFlag}).then((res) => {
+ getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => {
if (res.success) {
- if(this.paraTypeFlag === "1"){
+ if(this.selectionRows[0].paraTypeFlag === "1"){
this.$refs.paraCommonToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "2"){
+ }else if(this.selectionRows[0].paraTypeFlag === "2"){
this.$refs.paraHoleToolsList.getPara(res.result);
- }else if(this.paraTypeFlag === "3"){
+ }else if(this.selectionRows[0].paraTypeFlag === "3"){
this.$refs.paraThreadingToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "4"){
+ }else if(this.selectionRows[0].paraTypeFlag === "4"){
this.$refs.paraMillToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "5"){
+ }else if(this.selectionRows[0].paraTypeFlag === "5"){
this.$refs.paraTurningToolsList.getPara(res.result);
- }else if(this.paraTypeFlag === "6"){
+ }else if(this.selectionRows[0].paraTypeFlag === "6"){
this.$refs.paraBladeList.getPara(res.result);
}
} else {
@@ -519,7 +520,7 @@
},
loadData() {
let params = this.getQueryParams();
- if (this.nodeSelected && this.nodeSelected.key !== '-1') {
+ if (this.nodeSelected) {
// 鍔犺浇閫変腑鑺傜偣鐨勫瓙绫�
params.classifyId = this.nodeSelected.key;
this.loading = true;
@@ -537,10 +538,11 @@
}else if(this.paraTypeFlag === '6'){
httpUrl = this.url.paraBladeList
}else{
- this.dataSource = [];
- this.clearPara()
- this.loading = false;
- return
+ //this.dataSource = [];
+ // this.clearPara()
+ // this.loading = false;
+ // return
+ httpUrl = this.url.paraCommonToolList
}
getAction(httpUrl, params)
.then((res) => {
@@ -549,7 +551,8 @@
this.ipagination.total = res.result.total
//榛樿閫変腑绗竴鏉℃暟鎹�
this.selectedRowKeys[0] = res.result.records[0].id
- this.onSelectChange(this.selectedRowKeys)
+ this.selectionRows[0] = res.result.records[0]
+ this.onSelectChange(this.selectedRowKeys,this.selectionRows)
} else {
//this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
this.ipagination.total = 0
diff --git a/src/views/tms/modules/baseTools/ParaBladeList.vue b/src/views/tms/modules/baseTools/ParaBladeList.vue
index 8498951..f911afd 100644
--- a/src/views/tms/modules/baseTools/ParaBladeList.vue
+++ b/src/views/tms/modules/baseTools/ParaBladeList.vue
@@ -3,6 +3,9 @@
<!-- 褰撳墠椤甸潰涓氬姟閮ㄥ垎 -->
<a-card :bordered="false" :title="title" v-show="visable">
<a-descriptions title="宸ュ叿鍙傛暟璇︽儏">
+ <a-descriptions-item label="宸ュ叿绠�绉�">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃缂栫爜">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃鏍囪">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign }}</a-descriptions-item>
<a-descriptions-item label="鍒�鐗囧舰鐘�">{{ this.para == null || this.para.bladeShape == null ? '' : this.para.bladeShape }}</a-descriptions-item>
<a-descriptions-item label="鍒�鐗囬暱搴�">{{ this.para == null || this.para.bladeLength == null ? '' : this.para.bladeLength }}</a-descriptions-item>
<a-descriptions-item label="鍒囧墛鍒冩暟">{{ this.para == null || this.para.cuttingEdgeCount == null ? '' : this.para.cuttingEdgeCount }}</a-descriptions-item>
@@ -11,7 +14,7 @@
<a-descriptions-item label="鍒�灏朢">{{ this.para == null || this.para.noseAngleR == null ? '' : this.para.noseAngleR }}</a-descriptions-item>
<a-descriptions-item label="鍒�鐗囨潗鏂�">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
<a-descriptions-item label="闆朵欢鏉愭枡">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
- <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag }}</a-descriptions-item>
+ <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '鏄�' : '鍚�' }}</a-descriptions-item>
<a-descriptions-item label="闄勫姞鎶�鏈潯浠�">{{ this.para == null || this.para.technicalConditions == null ? '' : this.para.technicalConditions }}</a-descriptions-item>
<a-descriptions-item label="闄勫姞鎶�鏈潯浠惰鏄�">{{ this.para == null || this.para.conditionsInfo == null ? '' : this.para.conditionsInfo }}</a-descriptions-item>
<a-descriptions-item label="鍝佺墝">{{ this.para == null || this.para.brand == null ? '' : this.para.brand }}</a-descriptions-item>
diff --git a/src/views/tms/modules/baseTools/ParaBladeModal.vue b/src/views/tms/modules/baseTools/ParaBladeModal.vue
index aa2a9f8..0b5dd2b 100644
--- a/src/views/tms/modules/baseTools/ParaBladeModal.vue
+++ b/src/views/tms/modules/baseTools/ParaBladeModal.vue
@@ -68,6 +68,7 @@
:placeholder="disableSubmit ? '' : '璇疯緭鍏ヤ腑鏂囧悕绉�'"
v-model="model.chineseName"
:disabled="disableSubmit"
+ @change="e => chineseNameChange(e.target.value)"
/>
</a-form-model-item>
</a-col>
@@ -90,6 +91,7 @@
:placeholder="disableSubmit ? '' : '璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
v-model="model.toolModel"
:disabled="disableSubmit"
+ @change="e => toolModelChange(e.target.value)"
/>
</a-form-model-item>
</a-col>
@@ -131,17 +133,6 @@
</a-col>
</a-row>
</a-col>
- <a-col :span="8">
- <a-form-model-item prop="accuracyClass" label="绮惧害绛夌骇">
- <j-dict-select-tag
- type="list"
- v-model="model.accuracyClass"
- :triggerChange="true"
- dictCode="accuracy_class"
- :placeholder="disableSubmit ? '' : '璇烽�夋嫨绮惧害绛夌骇'"
- />
- </a-form-model-item>
- </a-col>
<a-col :span="6">
<a-row>
@@ -162,7 +153,7 @@
<a-col :span="8">
<a-form-model-item prop="applicationType" label="宸ュ叿绫诲瀷">
<j-dict-select-tag
- dict-code="equipment_category"
+ dict-code="application_type"
:placeholder="disableSubmit ? '' : '璇烽�夋嫨宸ュ叿绫诲瀷'"
v-model="model.applicationType"
:disabled="disableSubmit"
@@ -204,15 +195,6 @@
<a-row :gutter="24">
<a-col :span="8">
- <a-form-model-item prop="storageLocation" label="瀛樺偍浣嶇疆">
- <a-input
- :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ瓨鍌ㄤ綅缃�'"
- v-model="model.storageLocation"
- :disabled="disableSubmit"
- />
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
<a-form-model-item prop="lowerInventory" label="鏈�浣庡簱瀛�">
<a-input
:placeholder="disableSubmit ? '' : '璇疯緭鍏ユ渶浣庡簱瀛�'"
@@ -230,9 +212,6 @@
/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="auxiliaryUnitFlag" label="鏄惁鏈夎閲忚緟鍗曚綅">
<a-radio-group
@@ -245,6 +224,9 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="mainUnit" label="璁￠噺涓诲崟浣�">
<a-input
@@ -263,9 +245,6 @@
/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="supplierId" label="鍘傚">
<a-input
@@ -275,6 +254,9 @@
/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="price" label="鍗曚环">
<a-input
@@ -297,11 +279,41 @@
<a-row :gutter="24">
<a-col :span="6">
+ <a-form-model-item label="宸ュ叿绠�绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
+ <a-input
+ v-model="model.shortCalled"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ伐鍏风畝绉�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item label="闆嗗洟鍏徃缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
+ <a-input
+ v-model="model.groupCompanyCode"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="闆嗗洟鍏徃鏍囪" :labelCol="{span:4}" :wrapperCol="{span:20}" prop="groupCompanySign">
+ <a-input
+ v-model="model.groupCompanySign"
+ :disabled="true"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="6">
<a-form-model-item label="鍒�鐗囧舰鐘�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
<a-input
v-model="model.bladeShape"
:placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垁鐗囧舰鐘�'"
:disabled="disableSubmit"
+ @change="e => bladeShapeChange(e.target.value)"
></a-input>
</a-form-model-item>
</a-col>
@@ -311,6 +323,7 @@
v-model="model.bladeLength"
:placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垁鐗囬暱搴�'"
:disabled="disableSubmit"
+ @change="e => bladeLengthChange(e.target.value)"
></a-input>
</a-form-model-item>
</a-col>
@@ -320,6 +333,7 @@
v-model="model.cuttingEdgeCount"
:placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垏鍓婂垉鏁�'"
:disabled="disableSubmit"
+ @change="e => cuttingEdgeCountChange(e.target.value)"
></a-input>
</a-form-model-item>
</a-col>
@@ -350,6 +364,7 @@
v-model="model.noseAngleR"
:placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垁灏朢'"
:disabled="disableSubmit"
+ @change="e => noseAngleRChange(e.target.value)"
></a-input>
</a-form-model-item>
</a-col>
@@ -402,8 +417,8 @@
<a-col :span="6">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠惰鏄�"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
+ :labelCol="{span:12}"
+ :wrapperCol="{span:12}"
prop="conditionsInfo"
>
<a-input
@@ -530,8 +545,8 @@
<a-col :span="6">
<a-form-model-item
label="鏈�灏忓姞宸ュ唴铻虹汗鍏О鐩村緞"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
+ :labelCol="{span:15}"
+ :wrapperCol="{span:9}"
prop="minInternalThread"
>
<a-input
@@ -612,12 +627,19 @@
toolMaterial: [{ required: true, message: '璇疯緭鍏ュ垁鐗囨潗鏂�' }],
paintcoatFlag: [{ required: true, message: '璇烽�夋嫨鏄惁娑傚眰' }],
technicalConditions: [{ required: true, message: '璇疯緭鍏ラ檮鍔犳妧鏈潯浠�' }],
+ shortCalled: [{ required: true, message: '璇疯緭鍏ュ伐鍏风畝绉�' }],
},
url: {
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
locationCodeOptions: [],
+ chineseNameChange1:'',
+ toolModelChange1:'',
+ bladeShapeChange1:'',
+ bladeLengthChange1:'',
+ cuttingEdgeCountChange1:'',
+ noseAngleRChange1:''
}
},
created() {
@@ -637,7 +659,7 @@
this.editable = false
//鍒濆鍖栭粯璁ゅ��
this.model = {
- positionCode: ''
+ positionCode: ''
};
this.model.classifyId = nodeSelected.key
this.model.classifyNum = nodeSelected.entity.classifyId
@@ -654,6 +676,12 @@
this.$emit('close')
this.visible = false
this.$refs.form.clearValidate()
+ this.chineseNameChange1 = '',
+ this.toolModelChange1 = '',
+ this.bladeShapeChange1 = '',
+ this.bladeLengthChange1 = '',
+ this.cuttingEdgeCountChange1 = '',
+ this.noseAngleRChange1 = ''
},
positionCodeSearch() {
let positionCode = []
@@ -727,6 +755,36 @@
}
})
},
+ chineseNameChange(chineseNameChange){
+ this.chineseNameChange1 = chineseNameChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
+ +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ },
+ toolModelChange(toolModelChange){
+ this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
+ +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ },
+ bladeShapeChange(bladeShapeChange){
+ this.bladeShapeChange1 = bladeShapeChange == '' ? '' : '-'+bladeShapeChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
+ +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ },
+ bladeLengthChange(bladeLengthChange){
+ this.bladeLengthChange1 = bladeLengthChange == '' ? '' : '-'+bladeLengthChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
+ +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ },
+ cuttingEdgeCountChange(cuttingEdgeCountChange){
+ this.cuttingEdgeCountChange1 = cuttingEdgeCountChange == '' ? '' : '-'+cuttingEdgeCountChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
+ +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ },
+ noseAngleRChange(noseAngleRChange){
+ this.noseAngleRChange1 = noseAngleRChange == '' ? '' : '-'+noseAngleRChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
+ +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ }
},
}
</script>
diff --git a/src/views/tms/modules/baseTools/ParaCommonToolModal.vue b/src/views/tms/modules/baseTools/ParaCommonToolModal.vue
index aad3851..8852fb2 100644
--- a/src/views/tms/modules/baseTools/ParaCommonToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaCommonToolModal.vue
@@ -123,7 +123,7 @@
<a-col :span="8">
<a-form-model-item prop="applicationType"
label="宸ュ叿绫诲瀷">
- <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
+ <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
v-model="model.applicationType" :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
@@ -156,11 +156,6 @@
<a-row :gutter="24">
<a-col :span="8">
- <a-form-model-item prop="storageLocation" label="瀛樺偍浣嶇疆">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瓨鍌ㄤ綅缃�'" v-model="model.storageLocation" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
<a-form-model-item prop="lowerInventory" label="鏈�浣庡簱瀛�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶浣庡簱瀛�'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
</a-form-model-item>
@@ -170,9 +165,6 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶楂樺簱瀛�'" v-model="model.highestInventory" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="auxiliaryUnitFlag" label="鏄惁鏈夎閲忚緟鍗曚綅">
<a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鏈夎閲忚緟鍗曚綅'" :disabled="disableSubmit">
@@ -181,6 +173,9 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="mainUnit" label="璁￠噺涓诲崟浣�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忎富鍗曚綅'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -191,14 +186,14 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忚緟鍗曚綅'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
- <a-col :span="8">
+ <a-col :span="8">
<a-form-model-item prop="supplierId" label="鍘傚">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ巶瀹�'" v-model="model.supplierId" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="price" label="鍗曚环">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ崟浠�'" v-model="model.price" :disabled="disableSubmit"/>
diff --git a/src/views/tms/modules/baseTools/ParaHoleToolsList.vue b/src/views/tms/modules/baseTools/ParaHoleToolsList.vue
index 07b6b79..22d1674 100644
--- a/src/views/tms/modules/baseTools/ParaHoleToolsList.vue
+++ b/src/views/tms/modules/baseTools/ParaHoleToolsList.vue
@@ -3,13 +3,16 @@
<!-- 褰撳墠椤甸潰涓氬姟閮ㄥ垎 -->
<a-card :bordered="false" :title="title" v-show="visable">
<a-descriptions title="宸ュ叿鍙傛暟璇︽儏">
+ <a-descriptions-item label="宸ュ叿绠�绉�">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃缂栫爜">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃鏍囪">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign }}</a-descriptions-item>
<a-descriptions-item label="鐩村緞">{{ this.para == null || this.para.diameter == null ? '' : this.para.diameter }}</a-descriptions-item>
<a-descriptions-item label="鍒囧墛鍒冮敟瑙�">{{ this.para == null || this.para.coneAngle == null ? '' : this.para.coneAngle }}</a-descriptions-item>
<a-descriptions-item label="鍒囧墛鍒冮暱">{{ this.para == null || this.para.edgeLength == null ? '' : this.para.edgeLength }}</a-descriptions-item>
<a-descriptions-item label="鍒�鍏锋�婚暱">{{ this.para == null || this.para.totalLength == null ? '' : this.para.totalLength }}</a-descriptions-item>
<a-descriptions-item label="鍒�鍏锋潗鏂�">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
<a-descriptions-item label="闆朵欢鏉愭枡">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
- <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag }}</a-descriptions-item>
+ <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '鏄�' : '鍚�' }}</a-descriptions-item>
<a-descriptions-item label="鍒�鍏峰瀷寮�">{{ this.para == null || this.para.toolPattern == null ? '' : this.para.toolPattern }}</a-descriptions-item>
<a-descriptions-item label="鏌勯儴瑙勬牸">{{ this.para == null || this.para.handleSpecifications == null ? '' : this.para.handleSpecifications }}</a-descriptions-item>
<a-descriptions-item label="鍐峰嵈鏂瑰紡">{{ this.para == null || this.para.coolingMethod == null ? '' : this.para.coolingMethod }}</a-descriptions-item>
diff --git a/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue b/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
index 9520948..7eff890 100644
--- a/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
@@ -59,7 +59,7 @@
<a-col :span="24">
<a-form-model-item prop="chineseName"
label="涓枃鍚嶇О">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit"/>
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -75,7 +75,7 @@
<a-col :span="24">
<a-form-model-item prop="toolModel"
label="鍨嬪彿/鍥惧彿">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" />
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -123,7 +123,7 @@
<a-col :span="8">
<a-form-model-item prop="applicationType"
label="宸ュ叿绫诲瀷">
- <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
+ <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
v-model="model.applicationType" :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
@@ -156,11 +156,6 @@
<a-row :gutter="24">
<a-col :span="8">
- <a-form-model-item prop="storageLocation" label="瀛樺偍浣嶇疆">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瓨鍌ㄤ綅缃�'" v-model="model.storageLocation" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
<a-form-model-item prop="lowerInventory" label="鏈�浣庡簱瀛�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶浣庡簱瀛�'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
</a-form-model-item>
@@ -170,10 +165,7 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶楂樺簱瀛�'" v-model="model.highestInventory" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
- <a-col :span="8">
+ <a-col :span="8">
<a-form-model-item prop="auxiliaryUnitFlag" label="鏄惁鏈夎閲忚緟鍗曚綅">
<a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鏈夎閲忚緟鍗曚綅'" :disabled="disableSubmit">
<a-radio :value="'1'">鏄�</a-radio>
@@ -181,6 +173,9 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="mainUnit" label="璁￠噺涓诲崟浣�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忎富鍗曚綅'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -191,14 +186,14 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忚緟鍗曚綅'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="supplierId" label="鍘傚">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ巶瀹�'" v-model="model.supplierId" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="price" label="鍗曚环">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ崟浠�'" v-model="model.price" :disabled="disableSubmit"/>
@@ -216,8 +211,37 @@
<a-row :gutter="24">
<a-col :span="6">
+ <a-form-model-item label="宸ュ叿绠�绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
+ <a-input
+ v-model="model.shortCalled"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ伐鍏风畝绉�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item label="闆嗗洟鍏徃缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
+ <a-input
+ v-model="model.groupCompanyCode"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="闆嗗洟鍏徃鏍囪" :labelCol="{span:4}" :wrapperCol="{span:20}" prop="groupCompanySign">
+ <a-input
+ v-model="model.groupCompanySign"
+ :disabled="true"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="6">
<a-form-model-item label="鐩村緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
- <a-input v-model="model.diameter" :placeholder="disableSubmit?'':'璇疯緭鍏ョ洿寰�'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.diameter" :placeholder="disableSubmit?'':'璇疯緭鍏ョ洿寰�'" :disabled="disableSubmit" @change="e => diameterChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -232,7 +256,7 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
- <a-input v-model="model.totalLength" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏锋�婚暱'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.totalLength" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏锋�婚暱'" :disabled="disableSubmit" @change="e => totalLengthChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
</a-row>
@@ -279,7 +303,7 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionsInfo">
+ <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="conditionsInfo">
<a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
@@ -330,7 +354,7 @@
</a-row>
<a-row>
<a-col :span="6">
- <a-form-model-item label="閫傞厤鍒�鐗�-鍒�澶�-鍒�鏉�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fitterPart">
+ <a-form-model-item label="閫傞厤鍒�鐗�-鍒�澶�-鍒�鏉�" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="fitterPart">
<a-input v-model="model.fitterPart" :placeholder="disableSubmit?'':'璇疯緭鍏ラ�傞厤鍒�鐗�-鍒�澶�-鍒�鏉�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
@@ -494,7 +518,11 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
- locationCodeOptions:[]
+ locationCodeOptions:[],
+ chineseNameChange1:'',
+ toolModelChange1:'',
+ diameterChange1:'',
+ totalLengthChange1:'',
}
},
created() {
@@ -514,7 +542,7 @@
this.editable = false;
//鍒濆鍖栭粯璁ゅ��
this.model = {
- positionCode: ''
+ positionCode: ''
};
this.model.classifyId = nodeSelected.key
this.model.classifyNum = nodeSelected.entity.classifyId
@@ -531,6 +559,10 @@
this.$emit('close')
this.visible = false
this.$refs.form.clearValidate()
+ this.chineseNameChange1 = '',
+ this.toolModelChange1 = '',
+ this.diameterChange1 = '',
+ this.totalLengthChange1 = ''
},
positionCodeSearch() {
let positionCode = []
@@ -604,6 +636,22 @@
}
})
},
+ chineseNameChange(chineseNameChange){
+ this.chineseNameChange1 = chineseNameChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.totalLengthChange1
+ },
+ toolModelChange(toolModelChange){
+ this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.totalLengthChange1
+ },
+ diameterChange(diameterChange){
+ this.diameterChange1 = diameterChange == '' ? '' : '-'+diameterChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.totalLengthChange1
+ },
+ totalLengthChange(totalLengthChange){
+ this.totalLengthChange1 = totalLengthChange == '' ? '' : '-'+totalLengthChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.totalLengthChange1
+ }
}
}
</script>
diff --git a/src/views/tms/modules/baseTools/ParaMillToolList.vue b/src/views/tms/modules/baseTools/ParaMillToolList.vue
index 7e82034..970d00f 100644
--- a/src/views/tms/modules/baseTools/ParaMillToolList.vue
+++ b/src/views/tms/modules/baseTools/ParaMillToolList.vue
@@ -3,6 +3,9 @@
<!-- 褰撳墠椤甸潰涓氬姟閮ㄥ垎 -->
<a-card :bordered="false" :title="title" v-show="visable">
<a-descriptions title="宸ュ叿鍙傛暟璇︽儏">
+ <a-descriptions-item label="宸ュ叿绠�绉�">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃缂栫爜">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃鏍囪">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign }}</a-descriptions-item>
<a-descriptions-item label="鐩村緞">{{ this.para == null || this.para.diameter == null ? '' : this.para.diameter }}</a-descriptions-item>
<a-descriptions-item label="鍒�灏栬R">{{ this.para == null || this.para.noseAngleR == null ? '' : this.para.noseAngleR }}</a-descriptions-item>
<a-descriptions-item label="榻挎暟">{{ this.para == null || this.para.numberOfTeeth == null ? '' : this.para.numberOfTeeth }}</a-descriptions-item>
@@ -10,7 +13,7 @@
<a-descriptions-item label="鍒�鍏锋�婚暱">{{ this.para == null || this.para.totalLength == null ? '' : this.para.totalLength }}</a-descriptions-item>
<a-descriptions-item label="鍒�鍏锋潗鏂�">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
<a-descriptions-item label="闆朵欢鏉愭枡">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
- <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag }}</a-descriptions-item>
+ <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '鏄�' : '鍚�' }}</a-descriptions-item>
<a-descriptions-item label="鍒�鍏峰瀷寮�">{{ this.para == null || this.para.toolPattern == null ? '' : this.para.toolPattern }}</a-descriptions-item>
<a-descriptions-item label="瑁呭す瑙勬牸">{{ this.para == null || this.para.clampingSpecifications == null ? '' : this.para.clampingSpecifications }}</a-descriptions-item>
<a-descriptions-item label="鍐峰嵈鏂瑰紡">{{ this.para == null || this.para.coolingMethod == null ? '' : this.para.coolingMethod }}</a-descriptions-item>
diff --git a/src/views/tms/modules/baseTools/ParaMillToolModal.vue b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
index 220ca01..d7ee80c 100644
--- a/src/views/tms/modules/baseTools/ParaMillToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
@@ -59,7 +59,7 @@
<a-col :span="24">
<a-form-model-item prop="chineseName"
label="涓枃鍚嶇О">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit"/>
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -75,7 +75,7 @@
<a-col :span="24">
<a-form-model-item prop="toolModel"
label="鍨嬪彿/鍥惧彿">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" />
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -123,7 +123,7 @@
<a-col :span="8">
<a-form-model-item prop="applicationType"
label="宸ュ叿绫诲瀷">
- <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
+ <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
v-model="model.applicationType" :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
@@ -156,11 +156,6 @@
<a-row :gutter="24">
<a-col :span="8">
- <a-form-model-item prop="storageLocation" label="瀛樺偍浣嶇疆">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瓨鍌ㄤ綅缃�'" v-model="model.storageLocation" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
<a-form-model-item prop="lowerInventory" label="鏈�浣庡簱瀛�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶浣庡簱瀛�'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
</a-form-model-item>
@@ -170,9 +165,6 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶楂樺簱瀛�'" v-model="model.highestInventory" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="auxiliaryUnitFlag" label="鏄惁鏈夎閲忚緟鍗曚綅">
<a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鏈夎閲忚緟鍗曚綅'" :disabled="disableSubmit">
@@ -181,6 +173,9 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="mainUnit" label="璁￠噺涓诲崟浣�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忎富鍗曚綅'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -191,14 +186,14 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忚緟鍗曚綅'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
- <a-col :span="8">
+ <a-col :span="8">
<a-form-model-item prop="supplierId" label="鍘傚">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ巶瀹�'" v-model="model.supplierId" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="price" label="鍗曚环">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ崟浠�'" v-model="model.price" :disabled="disableSubmit"/>
@@ -216,13 +211,41 @@
<a-row :gutter="24">
<a-col :span="6">
+ <a-form-model-item label="宸ュ叿绠�绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
+ <a-input
+ v-model="model.shortCalled"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ伐鍏风畝绉�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item label="闆嗗洟鍏徃缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
+ <a-input
+ v-model="model.groupCompanyCode"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="闆嗗洟鍏徃鏍囪" :labelCol="{span:4}" :wrapperCol="{span:20}" prop="groupCompanySign">
+ <a-input
+ v-model="model.groupCompanySign"
+ :disabled="true"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="6">
<a-form-model-item label="鐩村緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
- <a-input v-model="model.diameter" :placeholder="disableSubmit?'':'璇疯緭鍏ョ洿寰�'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.diameter" :placeholder="disableSubmit?'':'璇疯緭鍏ョ洿寰�'" :disabled="disableSubmit" @change="e => diameterChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�灏栬R" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleR">
- <a-input v-model="model.noseAngleR" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁灏栬R'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.noseAngleR" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁灏栬R'" :disabled="disableSubmit" @change="e => noseAngleRChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -232,7 +255,7 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
- <a-input v-model="model.totalLength" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏锋�婚暱'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.totalLength" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏锋�婚暱'" :disabled="disableSubmit" @change="e => totalLengthChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
</a-row>
@@ -283,8 +306,10 @@
<a-input v-model="model.technicalConditions" :placeholder="disableSubmit?'':'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="6">
- <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionsInfo">
+ </a-row>
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="{span:3}" :wrapperCol="{span:21}" prop="conditionsInfo">
<a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
@@ -508,7 +533,12 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
- locationCodeOptions:[]
+ locationCodeOptions:[],
+ chineseNameChange1:'',
+ toolModelChange1:'',
+ diameterChange1:'',
+ totalLengthChange1:'',
+ noseAngleRChange1:''
}
},
mounted() {
@@ -528,7 +558,7 @@
this.editable = false;
//鍒濆鍖栭粯璁ゅ��
this.model = {
- positionCode: ''
+ positionCode: ''
};
this.model.classifyId = nodeSelected.key
this.model.classifyNum = nodeSelected.entity.classifyId
@@ -545,6 +575,11 @@
this.$emit('close')
this.visible = false
this.$refs.form.clearValidate()
+ this.chineseNameChange1 = '',
+ this.toolModelChange1 = '',
+ this.diameterChange1 = '',
+ this.totalLengthChange1 = '',
+ this.noseAngleRChange1 = ''
},
positionCodeSearch() {
let positionCode = []
@@ -618,6 +653,26 @@
}
})
},
+ chineseNameChange(chineseNameChange){
+ this.chineseNameChange1 = chineseNameChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
+ },
+ toolModelChange(toolModelChange){
+ this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
+ },
+ diameterChange(diameterChange){
+ this.diameterChange1 = diameterChange == '' ? '' : '-'+diameterChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
+ },
+ totalLengthChange(totalLengthChange){
+ this.totalLengthChange1 = totalLengthChange == '' ? '' : '-'+totalLengthChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
+ },
+ noseAngleRChange(noseAngleRChange){
+ this.noseAngleRChange1 = noseAngleRChange == '' ? '' : '-'+noseAngleRChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.diameterChange1+this.noseAngleRChange1+this.totalLengthChange1
+ }
}
}
</script>
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolList.vue b/src/views/tms/modules/baseTools/ParaThreadingToolList.vue
index ef48cb2..2674e79 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolList.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolList.vue
@@ -3,6 +3,9 @@
<!-- 褰撳墠椤甸潰涓氬姟閮ㄥ垎 -->
<a-card :bordered="false" :title="title" v-show="visable">
<a-descriptions title="宸ュ叿鍙傛暟璇︽儏">
+ <a-descriptions-item label="宸ュ叿绠�绉�">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃缂栫爜">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃鏍囪">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign }}</a-descriptions-item>
<a-descriptions-item label="铻虹汗浠ｅ彿">{{ this.para == null || this.para.threadCode == null ? '' : this.para.threadCode }}</a-descriptions-item>
<a-descriptions-item label="铻鸿窛">{{ this.para == null || this.para.pitch == null ? '' : this.para.pitch }}</a-descriptions-item>
<a-descriptions-item label="铻虹汗鏃嬪悜">{{ this.para == null || this.para.rotationDirection == null ? '' : this.para.rotationDirection }}</a-descriptions-item>
@@ -11,7 +14,7 @@
<a-descriptions-item label="鍒�鍏锋�婚暱">{{ this.para == null || this.para.totalLength == null ? '' : this.para.totalLength }}</a-descriptions-item>
<a-descriptions-item label="鍒�鍏锋潗鏂�">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
<a-descriptions-item label="闆朵欢鏉愭枡">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
- <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag }}</a-descriptions-item>
+ <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '鏄�' : '鍚�' }}</a-descriptions-item>
<a-descriptions-item label="澶栧瀷灏哄">{{ this.para == null || this.para.externalDimensions == null ? '' : this.para.externalDimensions }}</a-descriptions-item>
<a-descriptions-item label="鏌勯儴瑙勬牸">{{ this.para == null || this.para.handleSpecifications == null ? '' : this.para.handleSpecifications }}</a-descriptions-item>
<a-descriptions-item label="鍐峰嵈鏂瑰紡">{{ this.para == null || this.para.coolingMethod == null ? '' : this.para.coolingMethod }}</a-descriptions-item>
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
index 82a61ad..cfaa270 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -59,7 +59,7 @@
<a-col :span="24">
<a-form-model-item prop="chineseName"
label="涓枃鍚嶇О">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit"/>
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -75,7 +75,7 @@
<a-col :span="24">
<a-form-model-item prop="toolModel"
label="鍨嬪彿/鍥惧彿">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" />
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -123,7 +123,7 @@
<a-col :span="8">
<a-form-model-item prop="applicationType"
label="宸ュ叿绫诲瀷">
- <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
+ <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
v-model="model.applicationType" :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
@@ -156,11 +156,6 @@
<a-row :gutter="24">
<a-col :span="8">
- <a-form-model-item prop="storageLocation" label="瀛樺偍浣嶇疆">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瓨鍌ㄤ綅缃�'" v-model="model.storageLocation" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
<a-form-model-item prop="lowerInventory" label="鏈�浣庡簱瀛�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶浣庡簱瀛�'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
</a-form-model-item>
@@ -170,9 +165,6 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶楂樺簱瀛�'" v-model="model.highestInventory" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="auxiliaryUnitFlag" label="鏄惁鏈夎閲忚緟鍗曚綅">
<a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鏈夎閲忚緟鍗曚綅'" :disabled="disableSubmit">
@@ -181,6 +173,9 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="mainUnit" label="璁￠噺涓诲崟浣�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忎富鍗曚綅'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -191,14 +186,14 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忚緟鍗曚綅'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="supplierId" label="鍘傚">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ巶瀹�'" v-model="model.supplierId" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="price" label="鍗曚环">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ崟浠�'" v-model="model.price" :disabled="disableSubmit"/>
@@ -216,13 +211,41 @@
<a-row :gutter="24">
<a-col :span="6">
+ <a-form-model-item label="宸ュ叿绠�绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
+ <a-input
+ v-model="model.shortCalled"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ伐鍏风畝绉�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item label="闆嗗洟鍏徃缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
+ <a-input
+ v-model="model.groupCompanyCode"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="闆嗗洟鍏徃鏍囪" :labelCol="{span:4}" :wrapperCol="{span:20}" prop="groupCompanySign">
+ <a-input
+ v-model="model.groupCompanySign"
+ :disabled="true"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="6">
<a-form-model-item label="铻虹汗浠ｅ彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadCode">
- <a-input v-model="model.threadCode" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾逛唬鍙�'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.threadCode" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾逛唬鍙�'" :disabled="disableSubmit" @change="e => threadCodeChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item label="铻鸿窛" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
- <a-input v-model="model.pitch" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪璺�'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.pitch" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪璺�'" :disabled="disableSubmit" @change="e => pitchChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -231,7 +254,7 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item label="铻虹汗鍏樊甯︿唬鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tolerancezoneLevel">
+ <a-form-model-item label="铻虹汗鍏樊甯︿唬鍙�" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="tolerancezoneLevel">
<a-input v-model="model.tolerancezoneLevel" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾瑰叕宸甫浠ｅ彿'" :disabled="disableSubmit"></a-input>
</a-form-model-item>
</a-col>
@@ -283,13 +306,13 @@
<a-input v-model="model.technicalConditions" :placeholder="disableSubmit?'':'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
- <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionsInfo">
+ <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="conditionsInfo">
<a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
<a-col :span="6">
<a-form-model-item label="鍝佺墝" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
<a-input v-model="model.brand" :placeholder="disableSubmit?'':'璇疯緭鍏ュ搧鐗�'" :disabled="disableSubmit" ></a-input>
@@ -305,13 +328,13 @@
<a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'璇疯緭鍏ュ喎鍗存柟寮�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="6">
+ </a-row>
+ <a-row>
+ <a-col :span="6">
<a-form-model-item label="铻虹汗鏍囧噯" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
<a-input v-model="model.threadStandard" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾规爣鍑�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
<a-col :span="6">
<a-form-model-item label="鎺掑睉妲藉瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType">
<a-input v-model="model.fluteSoltType" :placeholder="disableSubmit?'':'璇疯緭鍏ユ帓灞戞Ы鍨�'" :disabled="disableSubmit" ></a-input>
@@ -327,13 +350,13 @@
<a-input v-model="model.guidingSize" :placeholder="disableSubmit?'':'璇疯緭鍏ュ鍚戝昂瀵�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item label="杩炴帴瀛斿緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectionAperture">
<a-input v-model="model.connectionAperture" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ繛鎺ュ瓟寰�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
<a-col :span="6">
<a-form-model-item label="杩炴帴閿Ы" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectingKeyway">
<a-input v-model="model.connectingKeyway" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ繛鎺ラ敭妲�'" :disabled="disableSubmit" ></a-input>
@@ -446,7 +469,11 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
- locationCodeOptions:[]
+ locationCodeOptions:[],
+ chineseNameChange1:'',
+ toolModelChange1:'',
+ threadCodeChange1:'',
+ pitchChange1:'',
}
},
created() {
@@ -466,7 +493,7 @@
this.editable = false;
//鍒濆鍖栭粯璁ゅ��
this.model = {
- positionCode: ''
+ positionCode: ''
};
this.model.classifyId = nodeSelected.key
this.model.classifyNum = nodeSelected.entity.classifyId
@@ -483,6 +510,10 @@
this.$emit('close')
this.visible = false
this.$refs.form.clearValidate()
+ this.chineseNameChange1 = '',
+ this.toolModelChange1 = '',
+ this.threadCodeChange1 = '',
+ this.pitchChange1 = ''
},
positionCodeSearch() {
let positionCode = []
@@ -556,6 +587,22 @@
}
})
},
+ chineseNameChange(chineseNameChange){
+ this.chineseNameChange1 = chineseNameChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
+ },
+ toolModelChange(toolModelChange){
+ this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
+ },
+ threadCodeChange(threadCodeChange){
+ this.threadCodeChange1 = threadCodeChange == '' ? '' : '-'+threadCodeChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
+ },
+ pitchChange(pitchChange){
+ this.pitchChange1 = pitchChange == '' ? '' : '-'+pitchChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
+ }
}
}
</script>
diff --git a/src/views/tms/modules/baseTools/ParaTurningToolsList.vue b/src/views/tms/modules/baseTools/ParaTurningToolsList.vue
index e9f14aa..dc244a4 100644
--- a/src/views/tms/modules/baseTools/ParaTurningToolsList.vue
+++ b/src/views/tms/modules/baseTools/ParaTurningToolsList.vue
@@ -3,6 +3,9 @@
<!-- 褰撳墠椤甸潰涓氬姟閮ㄥ垎 -->
<a-card :bordered="false" :title="title" v-show="visable">
<a-descriptions title="宸ュ叿鍙傛暟璇︽儏">
+ <a-descriptions-item label="宸ュ叿绠�绉�">{{ this.para == null || this.para.shortCalled == null ? '' : this.para.shortCalled }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃缂栫爜">{{ this.para == null || this.para.groupCompanyCode == null ? '' : this.para.groupCompanyCode }}</a-descriptions-item>
+ <a-descriptions-item label="闆嗗洟鍏徃鏍囪">{{ this.para == null || this.para.groupCompanySign == null ? '' : this.para.groupCompanySign }}</a-descriptions-item>
<a-descriptions-item label="鍒�澶磋鏍�">{{ this.para == null || this.para.headSpecifications == null ? '' : this.para.headSpecifications }}</a-descriptions-item>
<a-descriptions-item label="閰嶅鍒�鐗囧彿">{{ this.para == null || this.para.matchingNumber == null ? '' : this.para.matchingNumber }}</a-descriptions-item>
<a-descriptions-item label="涓诲亸瑙�">{{ this.para == null || this.para.leadAngle == null ? '' : this.para.leadAngle }}</a-descriptions-item>
@@ -11,7 +14,7 @@
<a-descriptions-item label="鍒�鍏锋�婚暱">{{ this.para == null || this.para.totalLength == null ? '' : this.para.totalLength }}</a-descriptions-item>
<a-descriptions-item label="鍒�鍏锋潗鏂�">{{ this.para == null || this.para.toolMaterial == null ? '' : this.para.toolMaterial }}</a-descriptions-item>
<a-descriptions-item label="闆朵欢鏉愭枡">{{ this.para == null || this.para.partMaterial == null ? '' : this.para.partMaterial }}</a-descriptions-item>
- <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag }}</a-descriptions-item>
+ <a-descriptions-item label="鏄惁娑傚眰">{{ this.para == null || this.para.paintcoatFlag == null ? '' : this.para.paintcoatFlag == '1' ? '鏄�' : '鍚�' }}</a-descriptions-item>
<a-descriptions-item label="鍒�鍏峰瀷寮�">{{ this.para == null || this.para.toolPattern == null ? '' : this.para.toolPattern }}</a-descriptions-item>
<a-descriptions-item label="鍐峰嵈鏂瑰紡">{{ this.para == null || this.para.coolingMethod == null ? '' : this.para.coolingMethod }}</a-descriptions-item>
<a-descriptions-item label="闄勫姞鎶�鏈潯浠�">{{ this.para == null || this.para.technicalConditions == null ? '' : this.para.technicalConditions }}</a-descriptions-item>
diff --git a/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue b/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
index 6cd8e17..3b09047 100644
--- a/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
@@ -59,7 +59,7 @@
<a-col :span="24">
<a-form-model-item prop="chineseName"
label="涓枃鍚嶇О">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit"/>
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -75,7 +75,7 @@
<a-col :span="24">
<a-form-model-item prop="toolModel"
label="鍨嬪彿/鍥惧彿">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" />
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -124,7 +124,7 @@
<a-col :span="8">
<a-form-model-item prop="applicationType"
label="宸ュ叿绫诲瀷">
- <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
+ <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
v-model="model.applicationType" :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
@@ -157,11 +157,6 @@
<a-row :gutter="24">
<a-col :span="8">
- <a-form-model-item prop="storageLocation" label="瀛樺偍浣嶇疆">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瓨鍌ㄤ綅缃�'" v-model="model.storageLocation" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
<a-form-model-item prop="lowerInventory" label="鏈�浣庡簱瀛�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶浣庡簱瀛�'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
</a-form-model-item>
@@ -171,9 +166,6 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶楂樺簱瀛�'" v-model="model.highestInventory" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="auxiliaryUnitFlag" label="鏄惁鏈夎閲忚緟鍗曚綅">
<a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鏈夎閲忚緟鍗曚綅'" :disabled="disableSubmit">
@@ -182,6 +174,9 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="mainUnit" label="璁￠噺涓诲崟浣�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忎富鍗曚綅'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -192,14 +187,14 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忚緟鍗曚綅'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="supplierId" label="鍘傚">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ巶瀹�'" v-model="model.supplierId" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="price" label="鍗曚环">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ崟浠�'" v-model="model.price" :disabled="disableSubmit"/>
@@ -214,11 +209,38 @@
<a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 鍙傛暟淇℃伅
</a-divider>
-
+ <a-row :gutter="24">
+ <a-col :span="6">
+ <a-form-model-item label="宸ュ叿绠�绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
+ <a-input
+ v-model="model.shortCalled"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ伐鍏风畝绉�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item label="闆嗗洟鍏徃缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
+ <a-input
+ v-model="model.groupCompanyCode"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="闆嗗洟鍏徃鏍囪" :labelCol="{span:4}" :wrapperCol="{span:20}" prop="groupCompanySign">
+ <a-input
+ v-model="model.groupCompanySign"
+ :disabled="true"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
<a-row :gutter="24">
<a-col :span="6">
<a-form-model-item label="鍒�澶磋鏍�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headSpecifications">
- <a-input v-model="model.headSpecifications" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁澶磋鏍�'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.headSpecifications" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁澶磋鏍�'" :disabled="disableSubmit" @change="e => headSpecificationsChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -228,7 +250,7 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="涓诲亸瑙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leadAngle">
- <a-input v-model="model.leadAngle" :placeholder="disableSubmit?'':'璇疯緭鍏ヤ富鍋忚'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.leadAngle" :placeholder="disableSubmit?'':'璇疯緭鍏ヤ富鍋忚'" :disabled="disableSubmit" @change="e => leadAngleChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -281,7 +303,7 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionsInfo">
+ <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="conditionsInfo">
<a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
@@ -524,7 +546,11 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
- locationCodeOptions:[]
+ locationCodeOptions:[],
+ chineseNameChange1:'',
+ toolModelChange1:'',
+ headSpecificationsChange1:'',
+ leadAngleChange1:'',
}
},
mounted() {
@@ -544,7 +570,7 @@
this.editable = false;
//鍒濆鍖栭粯璁ゅ��
this.model = {
- positionCode: ''
+ positionCode: ''
};
this.model.classifyId = nodeSelected.key
this.model.classifyNum = nodeSelected.entity.classifyId
@@ -561,6 +587,10 @@
this.$emit('close')
this.visible = false
this.$refs.form.clearValidate()
+ this.chineseNameChange1 = '',
+ this.toolModelChange1 = '',
+ this.headSpecificationsChange1 = '',
+ this.leadAngleChange1 = ''
},
positionCodeSearch() {
let positionCode = []
@@ -634,6 +664,22 @@
}
})
},
+ chineseNameChange(chineseNameChange){
+ this.chineseNameChange1 = chineseNameChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.headSpecificationsChange1+this.leadAngleChange1
+ },
+ toolModelChange(toolModelChange){
+ this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.headSpecificationsChange1+this.leadAngleChange1
+ },
+ headSpecificationsChange(headSpecificationsChange){
+ this.headSpecificationsChange1 = headSpecificationsChange == '' ? '' : '-'+headSpecificationsChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.headSpecificationsChange1+this.leadAngleChange1
+ },
+ leadAngleChange(leadAngleChange){
+ this.leadAngleChange1 = leadAngleChange == '' ? '' : '-'+leadAngleChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.headSpecificationsChange1+this.leadAngleChange1
+ }
}
}
</script>
diff --git a/src/views/tms/modules/baseTools/ToolsConfigPropertyList.vue b/src/views/tms/modules/baseTools/ToolsConfigPropertyList.vue
index 85df2cf..566cbd7 100644
--- a/src/views/tms/modules/baseTools/ToolsConfigPropertyList.vue
+++ b/src/views/tms/modules/baseTools/ToolsConfigPropertyList.vue
@@ -3,13 +3,12 @@
<!-- 褰撳墠椤甸潰涓氬姟閮ㄥ垎 -->
<a-card :bordered="false" :title="title" v-show="visable">
<a-descriptions title="宸ュ叿绠＄悊鍙傛暟璇︽儏">
- <a-descriptions-item label="宸ュ叿绫诲瀷">{{ this.para == null || this.para.applicationType == null ? '' : this.para.applicationType }}</a-descriptions-item>
+ <a-descriptions-item label="宸ュ叿绫诲瀷">{{ this.para == null || this.para.applicationType == null ? '' : this.para.applicationType == '1' ? '閫氱敤宸ュ叿' : '涓撶敤宸ュ叿' }}</a-descriptions-item>
<a-descriptions-item label="鏍囧噯绾у埆">{{ this.para == null || this.para.standardLevel == null ? '' : this.para.standardLevel }}</a-descriptions-item>
<a-descriptions-item label="鏍囧噯鍙�">{{ this.para == null || this.para.standardCode == null ? '' : this.para.standardCode }}</a-descriptions-item>
<a-descriptions-item label="鍘傚">{{ this.para == null || this.para.supplierId == null ? '' : this.para.supplierId }}</a-descriptions-item>
<a-descriptions-item label="浠撳簱鐪佷唤鍩庡競">{{ this.para == null || this.para.provinceCity == null ? '' : this.para.provinceCity }}</a-descriptions-item>
<a-descriptions-item label="搴撲綅鍙�">{{ this.para == null || this.para.positionCode == null ? '' : this.para.positionCode }}</a-descriptions-item>
- <a-descriptions-item label="瀛樺偍浣嶇疆">{{ this.para == null || this.para.storageLocation == null ? '' : this.para.storageLocation }}</a-descriptions-item>
<a-descriptions-item label="璁￠噺涓诲崟浣�">{{ this.para == null || this.para.mainUnit == null ? '' : this.para.mainUnit }}</a-descriptions-item>
<a-descriptions-item label="璁￠噺杈呭崟浣�">{{ this.para == null || this.para.auxiliaryUnit == null ? '' : this.para.auxiliaryUnit }}</a-descriptions-item>
<a-descriptions-item label="鍗曚环">{{ this.para == null || this.para.price == null ? '' : this.para.price }}</a-descriptions-item>
diff --git a/src/views/tms/modules/baseTools/ToolsConfigPropertyModal.vue b/src/views/tms/modules/baseTools/ToolsConfigPropertyModal.vue
index d0a3225..a68ea28 100644
--- a/src/views/tms/modules/baseTools/ToolsConfigPropertyModal.vue
+++ b/src/views/tms/modules/baseTools/ToolsConfigPropertyModal.vue
@@ -123,7 +123,7 @@
<a-col :span="8">
<a-form-model-item prop="applicationType"
label="宸ュ叿绫诲瀷">
- <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
+ <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
v-model="model.applicationType" :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
@@ -141,11 +141,6 @@
<a-row :gutter="24">
<a-col :span="8">
- <a-form-model-item prop="storageLocation" label="瀛樺偍浣嶇疆">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瓨鍌ㄤ綅缃�'" v-model="model.storageLocation" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
<a-form-model-item prop="lowerInventory" label="鏈�浣庡簱瀛�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶浣庡簱瀛�'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
</a-form-model-item>
@@ -155,9 +150,6 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶楂樺簱瀛�'" v-model="model.highestInventory" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="auxiliaryUnitFlag" label="鏄惁鏈夎閲忚緟鍗曚綅">
<a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鏈夎閲忚緟鍗曚綅'" :disabled="disableSubmit">
@@ -166,6 +158,9 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="mainUnit" label="璁￠噺涓诲崟浣�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忎富鍗曚綅'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -176,14 +171,14 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忚緟鍗曚綅'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="supplierId" label="鍘傚">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ巶瀹�'" v-model="model.supplierId" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="price" label="鍗曚环">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ崟浠�'" v-model="model.price" :disabled="disableSubmit"/>
diff --git a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
index 6a257e2..c270a49 100644
--- a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
+++ b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
@@ -286,11 +286,11 @@
align:"center",
dataIndex: 'accuracyClass'
},
- {
- title:'瀛樺偍浣嶇疆',
- align:"center",
- dataIndex: 'storageLocation'
- },
+ // {
+ // title:'瀛樺偍浣嶇疆',
+ // align:"center",
+ // dataIndex: 'storageLocation'
+ // },
{
title:'搴撲綅鍙�',
align:"center",
diff --git a/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue b/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
index d79f132..e20a71e 100644
--- a/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
+++ b/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
@@ -161,12 +161,16 @@
this.leafFlagShow = false
if(record.leafFlag == "1"){
this.paraTypeFlagShow = true
+ }else{
+ this.validatorRules.paraTypeFlag[0].required = false
+ this.paraTypeFlagShow = false
}
},
submitForm () {
const that = this;
// 瑙﹀彂琛ㄥ崟楠岃瘉
this.$refs.form.validate(valid => {
+ console.log("111111",valid)
if (valid) {
that.confirmLoading = true;
let httpurl = '';
diff --git a/src/views/tms/modules/toolsClassify/ToolsClassifyListLeft.vue b/src/views/tms/modules/toolsClassify/ToolsClassifyListLeft.vue
index 0c018fb..4efb255 100644
--- a/src/views/tms/modules/toolsClassify/ToolsClassifyListLeft.vue
+++ b/src/views/tms/modules/toolsClassify/ToolsClassifyListLeft.vue
@@ -3,7 +3,6 @@
:loading="cardLoading"
:bordered="false"
title="宸ュ叿鍒嗙被"
- style="height: 100%;"
>
<a-spin :spinning="loading">
<a-alert
@@ -20,7 +19,7 @@
>鍙栨秷</a>
</div>
</a-alert>
- <div class="drawer-bootom-button">
+ <!-- <div class="drawer-bootom-button">
<a-dropdown
:trigger="['click']"
placement="bottomCenter"
@@ -43,7 +42,7 @@
<a-icon type="bars" />
</a-button>
</a-dropdown>
- </div>
+ </div> -->
<a-input-search
@search="handleSearch"
@@ -55,13 +54,12 @@
/>
<!-- showLine -->
+ <div style="flex: 1;overflow:auto;margin-top: 10px;max-height: 500px; min-height: 500px">
<a-tree
:checkStrictly="checkStrictly"
- :expandedKeys.sync="expandedKeys"
:selectedKeys="selectedKeys"
- :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
:treeData="treeDataSource"
- :autoExpandParent="autoExpandParent"
+ :defaultExpandAll="true"
@select="onSelect"
@expand="onExpand"
>
@@ -89,6 +87,7 @@
</template>
</a-tree>
+ </div>
</a-spin>
</a-card>
</template>
diff --git a/src/views/tms/modules/verification/JSelectTools.vue b/src/views/tms/modules/verification/JSelectTools.vue
new file mode 100644
index 0000000..671f9c5
--- /dev/null
+++ b/src/views/tms/modules/verification/JSelectTools.vue
@@ -0,0 +1,207 @@
+<template>
+ <a-modal :title="title" :width="1000" :visible="visible" :maskClosable="false" @ok="handleOk" @cancel="handleCancel"
+ cancelText="鍏抽棴">
+ <a-card :bordered="false">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :md="7" :sm="7">
+ <a-form-item label="鍞竴缂栧彿">
+ <a-input placeholder="璇疯緭鍏ュ敮涓�缂栧彿妫�绱�" v-model="queryParam.onlyCode"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :md="3" :sm="3">
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ </a-space>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <a-table ref="table" size="middle" bordered rowKey="id" :scroll="{聽 y: 300聽}" :columns="columns"
+ :dataSource="dataSource" :pagination="ipagination" :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+ @change="handleTableChange">
+ </a-table>
+ </div>
+ <!-- table鍖哄煙-end -->
+ </a-card>
+ </a-modal>
+</template>
+
+<script>
+import JDictSelectTag from '@/components/dict/JDictSelectTag'
+import { getAction } from '@/api/manage'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JInput from '@/components/jeecg/JInput'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import Tooltip from 'ant-design-vue/es/tooltip'
+import JDate from '@/components/jeecg/JDate'
+import { filterObj } from '@/utils/util'
+
+export default {
+ name: 'JSelectTools',
+ mixins: [JeecgListMixin],
+ components: {
+ JDictSelectTag,
+ JEllipsis,
+ JInput,
+ Tooltip,
+ JDate
+ },
+ props: {
+ status: {
+ type: Number,
+ default: 1
+ }
+ },
+ data() {
+ return {
+ disableSubmit:false,
+ title: '',
+ visible: false,
+ disableMixinCreated: true,
+ queryParam: {},
+ columns: [
+ {
+ title: '鍞竴缂栧彿',
+ align: 'center',
+ dataIndex: 'onlyCode'
+ },
+ {
+ title: '閲忓叿缂栫爜',
+ align: 'center',
+ dataIndex: 'toolCode'
+ },
+ {
+ title: '閲忓叿鍚嶇О',
+ align: 'center',
+ dataIndex: 'toolName'
+ },
+ {
+ title: '鍨嬪彿/鍥惧彿',
+ align: 'center',
+ dataIndex: 'toolModel'
+ },
+ ],
+ url: {
+ list: '/tms/baseTools/verificationToolsList'
+ }
+
+ }
+ },
+ created() {
+
+ },
+ methods: {
+ showModals() {
+ this.selectedRowKeys = []
+ this.visible = true
+ this.loadData(1)
+ },
+ getQueryParams() {
+ //鑾峰彇鏌ヨ鏉′欢
+ let sqp = {}
+ if (this.superQueryParams) {
+ sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+ sqp['superQueryMatchType'] = this.superQueryMatchType
+ }
+ var param = Object.assign(sqp, this.queryParam)
+ // param.field = this.getQueryField();
+ param.pageNo = this.ipagination.current
+ param.pageSize = this.ipagination.pageSize
+ return filterObj(param)
+ },
+ loadData(arg) {
+ if (!this.url.list) {
+ this.$message.error('璇疯缃畊rl.list灞炴��!')
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1
+ }
+ var params = this.getQueryParams()//鏌ヨ鏉′欢
+
+ if (!params) {
+ return false
+ }
+
+ this.loading = true
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+
+ this.dataSource = res.result.records || res.result
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+
+ } else {
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+ getQueryField() {
+ //TODO 瀛楁鏉冮檺鎺у埗
+ // var str = "";
+ // this.columns.forEach(function (value) {
+ // str += value.dataIndex +"," ;
+ // });
+ // return str;
+ },
+ modalFormOk(val) {
+ // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
+ this.loadData()
+ this.selectedRowKeys = [val.id]
+ },
+ searchQuery() {
+ this.loadData()
+ this.onClearSelected()
+ },
+ searchReset() {
+ this.queryParam = {}
+ this.loadData()
+ this.onClearSelected()
+ },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+ handleCancel() {
+ this.close()
+ },
+ handleOk() {
+ this.$emit('sendSelectionRows', this.selectionRows[0])
+ this.close()
+ },
+ }
+}
+</script>
+<style>
+@import '~@assets/less/common.less';
+
+.frozenRowClass {
+ color: #c9c9c9;
+}
+
+.success {
+ color: green;
+}
+
+.error {
+ color: red;
+}
+</style>
diff --git a/src/views/tms/modules/verification/ToolVerificationRecordForm.vue b/src/views/tms/modules/verification/ToolVerificationRecordForm.vue
deleted file mode 100644
index 2827a29..0000000
--- a/src/views/tms/modules/verification/ToolVerificationRecordForm.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-<template>
- <a-spin :spinning="confirmLoading">
- <j-form-container :disabled="formDisabled">
- <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
- <a-row>
- <a-col :span="24">
- <a-form-model-item label="绉熸埛鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tenantId">
- <a-input v-model="model.tenantId" placeholder="璇疯緭鍏ョ鎴峰彿" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="鍒涘缓浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createdBy">
- <a-input v-model="model.createdBy" placeholder="璇疯緭鍏ュ垱寤轰汉" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="鍒涘缓鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createdTime">
- <j-date placeholder="璇烽�夋嫨鍒涘缓鏃堕棿" v-model="model.createdTime" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="鏇存柊浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updatedBy">
- <a-input v-model="model.updatedBy" placeholder="璇疯緭鍏ユ洿鏂颁汉" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="鏇存柊鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updatedTime">
- <j-date placeholder="璇烽�夋嫨鏇存柊鏃堕棿" v-model="model.updatedTime" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="鍞竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="onlyCode">
- <a-input v-model="model.onlyCode" placeholder="璇疯緭鍏ュ敮涓�缂栫爜" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="璁￠噺鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measureNumber">
- <a-input v-model="model.measureNumber" placeholder="璇疯緭鍏ヨ閲忓彿" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="涓嬫妫�瀹氭棩鏈�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nextVerificationDate">
- <j-date placeholder="璇烽�夋嫨涓嬫妫�瀹氭棩鏈�" v-model="model.nextVerificationDate" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="妫�瀹氭姤鍛婃棩鏈�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verificationReportDate">
- <j-date placeholder="璇烽�夋嫨妫�瀹氭姤鍛婃棩鏈�" v-model="model.verificationReportDate" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="璐ｄ换浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="personResponsible">
- <a-input v-model="model.personResponsible" placeholder="璇疯緭鍏ヨ矗浠讳汉" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="24">
- <a-form-model-item label="妫�瀹氱粨鏋滃強鎰忚" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="result">
- <a-input v-model="model.result" placeholder="璇疯緭鍏ユ瀹氱粨鏋滃強鎰忚" ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- </a-form-model>
- </j-form-container>
- </a-spin>
-</template>
-
-<script>
-
- import { httpAction, getAction } from '@/api/manage'
- import { validateDuplicateValue } from '@/utils/util'
-
- export default {
- name: 'ToolVerificationRecordForm',
- components: {
- },
- props: {
- //琛ㄥ崟绂佺敤
- disabled: {
- type: Boolean,
- default: false,
- required: false
- }
- },
- data () {
- return {
- model:{
- },
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
- },
- confirmLoading: false,
- validatorRules: {
- },
- url: {
- add: "/tms/toolVerificationRecord/add",
- edit: "/tms/toolVerificationRecord/edit",
- queryById: "/tms/toolVerificationRecord/queryById"
- }
- }
- },
- computed: {
- formDisabled(){
- return this.disabled
- },
- },
- created () {
- //澶囦唤model鍘熷鍊�
- this.modelDefault = JSON.parse(JSON.stringify(this.model));
- },
- methods: {
- add () {
- this.edit(this.modelDefault);
- },
- edit (record) {
- this.model = Object.assign({}, record);
- this.visible = true;
- },
- submitForm () {
- const that = this;
- // 瑙﹀彂琛ㄥ崟楠岃瘉
- this.$refs.form.validate(valid => {
- if (valid) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
- if(!this.model.id){
- httpurl+=this.url.add;
- method = 'post';
- }else{
- httpurl+=this.url.edit;
- method = 'put';
- }
- httpAction(httpurl,this.model,method).then((res)=>{
- if(res.success){
- that.$message.success(res.message);
- that.$emit('ok');
- }else{
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- })
- }
-
- })
- },
- }
- }
-</script>
\ No newline at end of file
diff --git a/src/views/tms/modules/verification/ToolVerificationRecordModal.vue b/src/views/tms/modules/verification/ToolVerificationRecordModal.vue
index 7fe1c74..b5f1f26 100644
--- a/src/views/tms/modules/verification/ToolVerificationRecordModal.vue
+++ b/src/views/tms/modules/verification/ToolVerificationRecordModal.vue
@@ -1,60 +1,212 @@
<template>
<j-modal
:title="title"
- :width="width"
- :visible="visible"
+ :width="1200"
+ :confirmLoading="confirmLoading"
switchFullscreen
+ centered
+ :visible="visible"
+ :mask-closable="false"
@ok="handleOk"
- :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="鍏抽棴">
- <tool-verification-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tool-verification-record-form>
+
+
+
+ <a-spin :spinning="spinning">
+ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="onlyCode" :labelCol="labelCol" :wrapperCol="wrapperCol" label="鍞竴缂栫爜">
+ <a-input-search v-model="model.onlyCode" placeholder="璇烽�夋嫨鍞竴缂栫爜" :disabled="disableSubmit"
+ @search="selectTools" enter-button
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="toolCode" :labelCol="labelCol" :wrapperCol="wrapperCol" label="閲忓叿缂栧彿">
+ <a-input placeholder="閫夋嫨鍞竴缂栫爜鍚庤嚜鍔ㄥ甫鍑�" v-model="model.toolCode" :disabled="true" />
+ </a-form-model-item>
+ </a-col>
+
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="paramaTableName" :labelCol="labelCol" :wrapperCol="wrapperCol" label="閲忓叿鍚嶇О">
+ <a-input placeholder="閫夋嫨鍞竴缂栫爜鍚庤嚜鍔ㄥ甫鍑�" v-model="model.toolName"
+ :disabled="true" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="瑙勬牸" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input placeholder="閫夋嫨鍞竴缂栫爜鍚庤嚜鍔ㄥ甫鍑�" v-model="model.toolModel"
+ :disabled="true" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="personResponsible" :labelCol="labelCol" :wrapperCol="wrapperCol" label="璐ｄ换浜�">
+ <j-dict-select-tag type="list" v-model="model.personResponsible" dictCode="sys_user,realname,id"
+ placeholder="璇烽�夋嫨璐ｄ换浜�" :disabled="disableSubmit" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="妫�瀹氭姤鍛婃棩鏈�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verificationReportDate">
+ <j-date placeholder="璇烽�夋嫨妫�瀹氭姤鍛婃棩鏈�" date-format="YYYY-MM-DD" v-model="model.verificationReportDate"
+ style="width: 100%" :disabled="disableSubmit" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-model-item label="璁￠噺鍙�" :labelCol="{span:3}" :wrapperCol="{span:19}">
+ <a-input placeholder="璇峰～鍐欒閲忓彿" v-model="model.measureNumber" :disabled="disableSubmit" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-model-item label="妫�瀹氱粨鏋滃強寤鸿" :labelCol="{span:3}" :wrapperCol="{span:19}" prop="result">
+ <a-textarea placeholder="璇峰～鍐欐瀹氱粨鏋滃強寤鸿" v-model="model.result"
+ :disabled="disableSubmit" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </a-spin>
+ <template slot="footer">
+ <a-button :style="{ marginRight: '8px' }" @click="handleCancel()">
+ 鍏抽棴
+ </a-button>
+
+ <a-button @click="handleOk()" :disabled="disableSubmit" type="primary" :loading="confirmLoading">纭畾</a-button>
+ </template>
+ <j-select-tools ref="toolListModel" @sendSelectionRows="getRows"></j-select-tools>
+
+
</j-modal>
</template>
<script>
- import ToolVerificationRecordForm from './ToolVerificationRecordForm'
- export default {
- name: 'ToolVerificationRecordModal',
- components: {
- ToolVerificationRecordForm
- },
- data () {
- return {
- title:'',
- width:800,
- visible: false,
- disableSubmit: false
- }
- },
- methods: {
- add () {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.add();
- })
+import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+import JSelectTools from './JSelectTools'
+import { requestPut, postAction, httpAction } from '@/api/manage'
+export default {
+ name: 'ToolVerificationRecordModal',
+ mixins: [JVxeTableModelMixin],
+ components: {
+ JSelectTools
+ },
+ data() {
+ return {
+ title: '鎿嶄綔',
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 6 }
},
- edit (record) {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.edit(record);
- })
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
},
- close () {
- this.$emit('close');
- this.visible = false;
+ confirmLoading: false,
+ spinning: false,
+ disabled: false,
+ disableSubmit: false,
+ validatorRules: {
+ onlyCode: [
+ { required: true, message: '璇烽�夋嫨鍞竴缂栫爜!' }
+ ]
},
- handleOk () {
- this.$refs.realForm.submitForm();
- },
- submitCallback(){
- this.$emit('ok');
- this.visible = false;
- },
- handleCancel () {
- this.close()
+ lastSelectionData: null,
+ url: {
+ add: '/tms/toolVerificationRecord/add',
+ edit: '/tms/toolVerificationRecord/edit'
}
}
+ },
+ created() {
+ },
+
+ methods: {
+ getRows(item) {
+ console.log(item)
+ if (item.id) {
+ this.$set(this.model, 'onlyCode', item.onlyCode)
+ this.$set(this.model, 'toolCode', item.toolCode)
+ this.$set(this.model, 'toolName', item.toolName)
+ this.$set(this.model, 'toolModel', item.toolModel)
+ }
+ },
+
+ selectTools: function() {
+ this.$refs.toolListModel.showModals()
+ this.$refs.toolListModel.title = '閫夋嫨閲忓叿淇℃伅'
+ this.$refs.toolListModel.disableSubmit = false
+ },
+
+ add() {
+ this.edit({})
+ },
+ edit(record) {
+ let that = this
+ that.visible = true
+ that.model = Object.assign({}, record)
+ },
+
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+ handleOk() {
+ const that = this
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ let formData = Object.assign(this.model)
+ that.confirmLoading = true
+ let httpurl = ''
+ let method = ''
+ if (!this.model.id) {
+ httpurl += this.url.add
+ method = 'post'
+ } else {
+ httpurl += this.url.edit
+ method = 'put'
+ }
+ httpAction(httpurl, this.model, method,formData).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.$emit('ok')
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ that.close()
+ })
+ } else {
+ return false
+ }
+ })
+ },
+
+ handleCancel() {
+ this.close()
+ },
+
+
}
-</script>
\ No newline at end of file
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
+
+
+
--
Gitblit v1.9.3