From b64259d6ca1b599427f927b2a35cd0ae5091ac92 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 17:05:59 +0800
Subject: [PATCH] 基础数据
---
src/components/view/technology.vue | 24 +-
src/components/view/mbom.vue | 125 ++++++++++---
src/components/view/self-inspection.vue | 167 +++++++++++++----
src/components/view/record-content.vue | 175 ++++++++++++++++---
src/main.js | 3
src/assets/api/controller.js | 11 +
6 files changed, 391 insertions(+), 114 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index e00f9ee..7a4dac8 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -70,14 +70,23 @@
delTechById:"/technologyTemplate/delTechById",//鏂板宸ヨ壓璺嚎==>鍒犻櫎
selecTechById:"/technologyTemplate/selecTechById",//鏂板宸ヨ壓璺嚎--銆嬬紪杈�
delAllTech:"/technologyTemplate/delAllTech",//鎵归噺鍒犻櫎
+ addTechMode:"/technicalModel/addTechMode",//鎶�鏈寚鏍�---銆嬫柊澧�
+ delTechBy:"/technicalModel/delTechById",//鎶�鏈�--.鍒犻櫎
selectAllleft:"/technicalModel/selectAllTechTem",//鎶�鏈寚鏍�-->宸﹁竟
selectAllright:"/technicalModel/selectAllTechNam",//鎶�鏈寚鏍�--銆嬪彸杈�
chooseProFath:"/technicalModel/chooseProFath",//鎶�鏈寚鏍�---銆嬬埗绫婚�夋嫨
chooseTechFath: "/technicalModel/chooseTechFath",// 鎶�鏈�--->宸ュ簭宸ヨ壓
selectAllMbom:"/mbomModel/selectAllMbom",//鐗╂枡缁存姢--銆嬪彸杈�
+ material:"/mbomModel/delMbomById",//鐗╂枡娓呭崟鍒犻櫎
selectAllTeque:"/techniqueModel/selectAllTeque",//鐢熶骇宸ヨ壓缁存姢---銆傚彸杈�
selectAllSelf:"/selfcheckModel/selectAllSelf",//鑷缓缁存姢-----銆嬪彸杈�
- selectjilu:"/techniqueModel/selectAllTeque",//鐢熶骇璁板綍缁存姢---銆嬪彸杈�
+ addSelfcheck:"/selfcheckModel/addSelfcheck",//鑷 ------銆嬫柊澧�
+ delSelfcheck:"/selfcheckModel/delSelfcheckById",//鑷----.鍒犻櫎
+ delAll:"selfcheckModel/delAllTech",//鎵归噺鍒犻櫎---.鑷
+ selectjilu:"/recordModel/selectAllRecord",//鐢熶骇璁板綍缁存姢---銆嬪彸杈�
+ selecRecord:"/recordModel/selecRecordById",//鐢熶骇璁板綍----.缂栬緫
+ delQueById:"/recordModel/delQueById",//鍒犻櫎---.璁板綍鍐呭
+ addRecord:"/recordModel/addRecord"//鐢熶骇璁板綍-------.鏂板
}
const url = {
enter: "user/enter", //鐧诲綍
diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index a52dcd9..985a9fd 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -29,22 +29,33 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="宸ュ簭:">
- <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
- </el-select>
- </el-form-item>
+ <el-form-item label="宸ュ簭">
+ <template>
+ <el-select v-model="search.work"
+ placeholder="璇烽�夋嫨绫诲瀷"
+ allow-create
+ filterable
+ @change="workevent"
+ >
+ <el-option
+ v-for="(item,index) in process"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </template>
+ </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="宸ヨ壓鍚嶇О:">
- <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ <el-select v-model="search.craft" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-option
+ v-for="item in craftapi"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -56,7 +67,7 @@
<template>
<el-table
border
- :data="tableData"
+ :data="tableapi"
height="calc(80vh - 250px)"
style="width: 100%">
<el-table-column type="index" label="搴忓彿" width="70">
@@ -66,28 +77,37 @@
label="渚涘簲鍟嗗悕绉�"
width="180">
<template slot-scope="scope">
- <el-input v-model="scope.row.input" placeholder="璇疯緭鍏ュ唴瀹�" ></el-input>
+ <el-input v-model="scope.row.input" placeholder="" ></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop=""
+ label="璐ㄩ噺杩芥函鍙�"
+ width="180">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.input" placeholder="" ></el-input>
</template>
</el-table-column>
<el-table-column
prop="name"
- label="璐ㄩ噺杩芥函鍙�"
- width="180">
+ label="鍘熸潗鏂欏悕绉�">
<template slot-scope="scope">
- <el-input v-model="scope.row.name" placeholder="璇疯緭鍏ュ唴瀹�" ></el-input>
+ <el-input v-model="scope.row.name" placeholder="" ></el-input>
</template>
</el-table-column>
<el-table-column
prop="address"
- label="鍘熸潗鏂欏悕绉�">
- </el-table-column>
- <el-table-column
- prop="address"
label="瑙勬牸鍨嬪彿">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.input" placeholder="" ></el-input>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ prop="unit"
label="鍗曚綅">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.unit" placeholder="" ></el-input>
+ </template>
</el-table-column>
</el-table>
</template>
@@ -143,7 +163,7 @@
<el-table-column label="鎿嶄綔" width="130">
<template slot-scope="scope">
<!-- <span class="table_do" @click="upContent(scope.row)">缂栬緫 </span> -->
- <span class="table_do" @click="deleteRow(scope.$index, tableData)">鍒犻櫎</span>
+ <span class="table_do" @click="deleteRow(scope.$index, scope.row)">鍒犻櫎</span>
</template>
</el-table-column>
</el-table>
@@ -163,22 +183,62 @@
return {
search:{},
list:[],
- process:[],
+ process:{},
// handleClose:[],
- checkTreeNode:[],
+ checkTreeNode:{
+ name:'鍓ョ紗'
+ },
tableData:[],
- search:{},
+ tableapi:[],
+ search:{
+ type:'',
+ work:'',
+ craft:'',
+
+ },
+ addsearch:{},
+ upData:{},
form:{},
dialogVisible:false,
typeselect:0,
tableData: [],
- input:''
+ input:'',
+ craftapi:[],
}
},
mounted() {
- this.selectAllleft()
+ this.selectAllleft()
+ this.selectAllMbom()
},
methods:{
+ workevent(val){
+ console.log(val);
+ let idx = this.process.findIndex(el => el.name === val)
+ this.craftapi = this.process[idx].children
+ },
+ //鏂板
+ chooseTechFath() {
+ this.$axios.get(this.$api.url.chooseTechFath,{
+ params:{type:this.typeselect}
+ }).then(res => {
+ this.process = res.data;
+ console.log(this.process);
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
+ //鍒犻櫎
+ material() {
+ this.$axios.post(this.$api.url.material,{
+ id:this.upData.id
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
TYpe(val) {
this.typeselect = val
this.selectAllleft()
@@ -189,6 +249,7 @@
params:{type:this.typeselect}
}).then(res => {
this.list = res.data;
+ console.log(this.list);
}, {
headers: {
"Content-Type": "application/json"
@@ -221,6 +282,7 @@
},
event(){
this.dialogVisible = true
+ this.chooseTechFath()
},
Addrow() {
if (this.tableData == undefined) {
@@ -252,7 +314,10 @@
this.selects = val;
},
deleteRow(index, rows) {
- rows.splice(index, 1);
+ console.log(rows);
+ this.tableData.splice(index,1)
+ this.upData.id = rows.id
+ this.material()
},
}
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index c6be046..ff679d3 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -161,7 +161,7 @@
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅">
</el-table-column>
- <el-table-column prop="thing" label="澶囨敞">
+ <el-table-column prop="note" label="澶囨敞">
</el-table-column>
<el-table-column label="鎿嶄綔" width="130">
<template slot-scope="scope">
@@ -174,6 +174,50 @@
</div>
<el-dialog title="缂栬緫璁板綍鍐呭" :visible.sync="upDia" width="500px">
<div class="body">
+ <el-row style="line-height: 46px;">
+ <el-col :span="4" style="font-size: 14px;text-align: right;">绫诲瀷:</el-col>
+ <el-col :span="16" :offset="1">
+ <template>
+ <el-select v-model="edit.techFathe" placeholder="璇烽�夋嫨绫诲瀷" style="width: 310px;">
+ <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
+ <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
+ <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
+ <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ </el-select>
+ </template>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 46px;">
+ <el-col :span="4" style="font-size: 14px;text-align: right;">宸ュ簭:</el-col>
+ <el-col :span="16" :offset="1">
+ <template>
+ <el-select v-model="edit.techFather"
+ placeholder="璇烽�夋嫨绫诲瀷" style="width: 310px;">
+ <el-option
+ v-for="item in process"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </template>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 46px;">
+ <el-col :span="4" style="font-size: 14px;text-align: right;">宸ヨ壓:</el-col>
+ <el-col :span="16" :offset="1">
+ <template>
+ <el-select v-model="edit.techFathe" placeholder="璇烽�夋嫨绫诲瀷" style="width: 310px;">
+ <el-option
+ v-for="item in craftapi"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </template>
+ </el-col>
+ </el-row>
<el-row style="line-height: 46px;">
<el-col :span="4" style="font-size: 14px;text-align: right;">鍚嶇О:</el-col>
<el-col :span="16" :offset="1">
@@ -189,7 +233,7 @@
<el-row style="line-height: 46px;">
<el-col :span="4" style="font-size: 14px;text-align: right;">澶囨敞:</el-col>
<el-col :span="16" :offset="1">
- <el-input v-model="upData.thing" size="small" clearable></el-input>
+ <el-input v-model="upData.note" size="small" clearable></el-input>
</el-col>
</el-row>
</div>
@@ -204,53 +248,53 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-select v-model="form.type" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
+ <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
+ <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
+ <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
</el-select>
</template>
</el-form-item>
<el-form-item label="宸ュ簭">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-select v-model="form.work"
+ @change="workevent"
+ placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in process"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</template>
</el-form-item>
<el-form-item label="宸ヨ壓鍚嶇О">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-select v-model="form.craft" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in craftapi"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</template>
</el-form-item>
<el-form-item label="璁板綍">
- <el-input v-model="form.name"></el-input>
+ <el-input v-model="form.record"></el-input>
</el-form-item>
<el-form-item label="澶囨敞">
- <el-input v-model="form.vvvv"></el-input>
+ <el-input v-model="form.remarks"></el-input>
</el-form-item>
<el-form-item label="鍗曚綅">
- <el-input v-model="form.aaaa"></el-input>
+ <el-input v-model="form.unit"></el-input>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button>
+ <el-button type="primary" @click="add">纭� 瀹�</el-button>
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -296,13 +340,13 @@
</template>
</el-form-item>
<el-form-item label="璁板綍">
- <el-input v-model="form.name"></el-input>
+ <el-input v-model="form.record"></el-input>
</el-form-item>
<el-form-item label="澶囨敞">
- <el-input v-model="form.vvvv"></el-input>
+ <el-input v-model="form.remarks"></el-input>
</el-form-item>
<el-form-item label="鍗曚綅">
- <el-input v-model="form.aaaa"></el-input>
+ <el-input v-model="form.unit"></el-input>
</el-form-item>
</el-form>
</div>
@@ -325,10 +369,19 @@
},
options:[],
value:{},
- form:{},
+ craftapi:[],
+ form:{
+ type:'',
+ work:'',
+ craft:'',
+ name:'',
+ record:'',
+ remarks:'',
+ unit:'',
+ },
modifyVisible:false,
dialogVisible:false,
- process: [],
+ process: {},
list: [],
checkTreeNode: {},
tableData: [],
@@ -337,6 +390,14 @@
typeselect:0,
upDia: false,
checkTreeNode:[],
+ edit:{
+ name:'',
+ note:'',
+ techFather:'',
+ techName:'',
+ type:'',
+ unit:'',
+ },
upData: {
id: 0,
name: null,
@@ -349,6 +410,59 @@
this.selectAllleft()
},
methods: {
+ delQueById() {
+ this.$axios.get(this.$api.url.chooseTechFath)
+ },
+ childrenClick() {},
+ //鏂板
+ workevent(val){
+ console.log(val);
+ let idx = this.process.findIndex(el => el.name === val)
+ this.craftapi = this.process[idx].children
+ },
+ chooseTechFath() {
+ this.$axios.get(this.$api.url.chooseTechFath,{
+ params:{type:this.typeselect}
+ }).then(res => {
+ this.process = res.data;
+ console.log(this.process);
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
+ addRecord() {
+ this.$axios.post(this.$api.url.addRecord,{
+ name:this.form.record,
+ note:this.form.remarks,
+ techTemId:this.form.craft,
+ unit:this.form.unit,
+ }
+ , {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }
+ )
+ },
+ add() {
+ this.dialogVisible = false
+ this.addRecord()
+ this.selectjilu()
+ this.form = {};
+ },
+ //缂栬緫 this.upData
+ selecRecord() {
+ this.$axios.get(this.$api.url.selecRecord,{
+ params:{
+ id:this.upData.id
+ }
+ }).then(res => {
+ this.edit = res.data
+ console.log(this.edit);
+ })
+ },
TYpe(val) {
this.typeselect = val
console.log(this.typeselect);
@@ -377,6 +491,7 @@
},
addend(){
this.dialogVisible = true
+ this.chooseTechFath()
},
filterNode(value, data) {
if (!value) return true;
@@ -439,7 +554,9 @@
rows.splice(index, 1);
},
upContent(ob) {
- this.upData = this.HaveJson(ob)
+ this.upData = ob
+ console.log(this.upData);
+ this.selecRecord()
this.upDia = true
},
submitUpData() {
diff --git a/src/components/view/self-inspection.vue b/src/components/view/self-inspection.vue
index be60b33..7989a10 100644
--- a/src/components/view/self-inspection.vue
+++ b/src/components/view/self-inspection.vue
@@ -113,7 +113,7 @@
<el-col :span="12" style="line-height: 32px;">鑷椤圭洰缁存姢</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="addend">鏂板</el-button>
- <el-button icon="el-icon-edit-outline" @click="modify">淇敼</el-button>
+ <!-- <el-button icon="el-icon-edit-outline" @click="modify">淇敼</el-button> -->
<el-button icon="el-icon-delete" @click="dels">鍒犻櫎</el-button>
</el-col>
</el-row>
@@ -126,8 +126,8 @@
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
<el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
</el-select>
- <span>宸ュ簭锛�</span>
- <el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <!-- <span>宸ュ簭锛�</span> -->
+ <!-- <el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
<el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
</el-select>
<span>椤圭洰锛�</span>
@@ -136,7 +136,7 @@
</el-select>
<el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
<el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌�
- 璇�</span></el-button>
+ 璇�</span></el-button> -->
</div>
<div class="thing">
<div class="left">
@@ -170,14 +170,15 @@
</el-table-column>
<el-table-column label="鎿嶄綔" width="130">
<template slot-scope="scope">
- <span class="table_do" @click="upContent(scope.row)">缂栬緫 </span>
- <span class="table_do" @click="deleteRow(scope.$index, tableData)">鍒犻櫎</span>
+ <!-- <span class="table_do" @click="upContent(scope.row)">缂栬緫 -->
+ <!-- </span> -->
+ <span class="table_do" @click="deleteRow(scope.$index, scope.row)">鍒犻櫎</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
- <el-dialog title="缂栬緫璁板綍鍐呭" :visible.sync="upDia" width="500px">
+ <!-- <el-dialog title="缂栬緫璁板綍鍐呭" :visible.sync="upDia" width="500px">
<div class="body">
<el-row style="line-height: 46px;">
<el-col :span="4" style="font-size: 14px;text-align: right;">鍚嶇О:</el-col>
@@ -194,13 +195,13 @@
<el-row style="line-height: 46px;">
<el-col :span="4" style="font-size: 14px;text-align: right;">鏍囧噯鍊�:</el-col>
<el-col :span="16" :offset="1">
- <el-input v-model="upData.stand" size="small" clearable></el-input>
+ <el-input v-model="upData.required" size="small" clearable></el-input>
</el-col>
</el-row>
<el-row style="line-height: 46px;">
<el-col :span="4" style="font-size: 14px;text-align: right;">鍐呮帶鍊�:</el-col>
<el-col :span="16" :offset="1">
- <el-input v-model="upData.ask" size="small" clearable></el-input>
+ <el-input v-model="upData.internal" size="small" clearable></el-input>
</el-col>
</el-row>
</div>
@@ -208,31 +209,31 @@
<el-button type="primary" @click="submitUpData">纭� 瀹�</el-button>
<el-button @click="upDia = false">鍙� 娑�</el-button>
</span>
- </el-dialog>
+ </el-dialog> -->
<!-- 鏂板寮圭獥 -->
<el-dialog title="鑷缓鏂板" :visible.sync="dialogVisible" width="35%">
<div>
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-select v-model="form.value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
+ <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
+ <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
+ <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
</el-select>
</template>
</el-form-item>
<el-form-item label="宸ュ簭">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-select v-model="form.procedure"
+ @change="workevent"
+ placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in process"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</template>
@@ -241,48 +242,48 @@
<el-col :span="10">
<el-form-item label="宸ヨ壓鍚嶇О">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 180px;">
+ <el-select v-model="form.name" placeholder="璇烽�夋嫨绫诲瀷" style="width: 180px;">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in craftapi"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</template>
</el-form-item>
</el-col>
<el-col :span="10" :offset="3">
- <el-form-item label="鑷缓椤圭洰">
- <el-input v-model="form.name" style="width: 180px;"></el-input>
+ <el-form-item label="鑷椤圭洰">
+ <el-input v-model="form.project" style="width: 180px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="鍗曚綅">
- <el-input v-model="form.vvvv" style="width: 180px;"></el-input>
+ <el-input v-model="form.unit" style="width: 180px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="10" :offset="3">
<el-form-item label="鏍囧噯鍊�">
- <el-input v-model="form.aaaa" style="width: 180px;"></el-input>
+ <el-input v-model="form.standard" style="width: 180px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="鍐呮帶鍊�" >
- <el-input v-model="form.aaaa" style="width: 180px;"></el-input>
+ <el-input v-model="form.control" style="width: 180px;"></el-input>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button>
+ <el-button type="primary" @click="add">纭� 瀹�</el-button>
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
<!-- 淇敼寮圭獥 -->
- <el-dialog title="宸ヨ壓璺嚎淇敼" :visible.sync="modifyVisible" width="35%">
+ <!-- <el-dialog title="宸ヨ壓璺嚎淇敼" :visible.sync="modifyVisible" width="35%">
<div>
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
@@ -351,7 +352,7 @@
<el-button type="primary" @click="modifyVisible = false">纭� 瀹�</el-button>
<el-button @click="modifyVisible = false">鍙� 娑�</el-button>
</span>
- </el-dialog>
+ </el-dialog> -->
</div>
</template>
@@ -366,19 +367,31 @@
},
options:[],
value:{},
- form:{},
+ form:{
+ value:'',
+ procedure:'',
+ name:'',
+ project:'',
+ unit:'',
+ standard:'',
+ control:'',
+ },
modifyVisible:false,
dialogVisible:false,
process: [],
product: [],
list: [],
- checkTreeNode: {},
+ checkTreeNode: {
+ name:'鍓ョ紗',
+ },
tableData: [],
upIndex: 0,
selects: [],
- upDia: false,
+ upDia: [],
typeselect:0,
- checkTreeNode:[],
+ process:[],
+ craftapi:[],
+ delete:{},
upData: {
id: 0,
name: null,
@@ -392,6 +405,72 @@
this.selectAllleft()
},
methods: {
+ //鍒犻櫎
+ delSelfcheck() {
+ console.log(this.upData.id);
+ this.$axios.post(this.$api.url.addSelfcheck,{
+ id:this.upData.id
+ }
+ , {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }
+ )
+ },
+ deleteRow(index, row) {
+ this.tableData.splice(index,1)
+ this.upData.id = row.id
+ this.delSelfcheck()
+ },
+ //鎵归噺鍒犻櫎
+ delAll() {
+ this.$axios.post(this.$api.url.delAll,{
+ ids:this.delete
+ })
+ },
+
+
+
+ //鏂板
+ add() {
+ this.dialogVisible = false
+ this.addSelfcheck()
+ },
+ addSelfcheck() {
+ this.$axios.post(this.$api.url.addSelfcheck,{
+ internal:this.form.control,
+ name:this.form.project,
+ required:this.form.standard,
+ techTemId:this.form.name,
+ unit:this.form.unit,
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }).then(res=>{
+ this.selectAllSelf()
+ this.form = {}
+ })
+ },
+ //宸ュ簭宸ヨ壓
+ chooseTechFath() {
+ this.$axios.get(this.$api.url.chooseTechFath,{
+ params:{type:this.typeselect}
+ }).then(res => {
+ this.process = res.data;
+ console.log(this.process);
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
+ workevent(val){
+ console.log(val);
+ let idx = this.process.findIndex(el => el.name === val)
+ this.craftapi = this.process[idx].children
+ },
TYpe(val) {
this.typeselect = val
console.log(this.typeselect);
@@ -420,6 +499,7 @@
},
addend(){
this.dialogVisible = true
+ this.chooseTechFath()
},
filterNode(value, data) {
if (!value) return true;
@@ -471,10 +551,13 @@
}
}
})
+ let cc = this.selects.map(el => {
+ return el.id
+ })
+ this.delete = cc.join(',')
+ console.log(this.delete);
+ this.delAll()
this.$message.success('鍒犻櫎瀹屾垚')
- },
- deleteRow(index, rows) {
- rows.splice(index, 1);
},
upContent(ob) {
this.upData = this.HaveJson(ob)
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index a34acbe..debe67f 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -120,7 +120,7 @@
</div>
<div class="choose">
<span>绫诲瀷锛�</span>
- <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" @change="type" style="width: 224px;margin-right: 30px;">
+ <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" @change="type" style="width: 224px;margin-right: 30px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -396,12 +396,13 @@
process: [],
product: [],
procedure:[],
- checkTreeNode:'涓嬫枡',
+ checkTreeNode:{
+ name:'涓嬫枡'
+ },
towTree:[],
value:"",
modifyevent:false,
dialogVisible:false,
- checkTreeNode: {},
tableData: [],
upIndex: 0,
selects: [],
@@ -427,10 +428,12 @@
this.chooseTech()
this.chooseDevGroup()
this.chooseElement()
+ this.selectAllTechNam()
},
methods: {
type(val){
this.typeselect = val
+ this.upData.type = val
console.log(this.typeselect);
this.selectAllTechTem()
},
@@ -438,8 +441,8 @@
Neworder() {
this.dialogVisible = false
this.addTechTemp()
- this.selectAllTechNam()
// this.form = '';
+
},
Deleteapi() {
this.dialogVisible = false
@@ -463,6 +466,8 @@
}
).then(res=>{
console.log(res);
+ this.selectAllTechNam()
+ this.form = {}
})
},
@@ -520,6 +525,9 @@
headers: {
"Content-Type": "application/json"
}
+ }).then(res =>{
+ console.log(res);
+
})
},
@@ -608,22 +616,16 @@
}
}
})
- // console.log(this.selects);
let cc = this.selects.map(el => {
- // console.log(el.id);
return el.id
})
- // console.log(this.delete);
this.delete = cc.join(',')
console.log(this.delete);
this.delAllTech()
- // this.delete =
- // console.log('444');
this.$message.success('鍒犻櫎瀹屾垚')
},
deleteRow(index, rows) {
- // console.log(rows);
- // rows.splice(index, 1);
+
this.tableData.splice(index,1)
this.upData.id = rows.id
this.delTechById()
diff --git a/src/main.js b/src/main.js
index d0bd9ce..905840f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,7 +24,8 @@
Vue.use(api);
// const javaApi = 'http://127.0.0.1:8001/'
-const javaApi = 'http://192.168.73.249:8001/'
+const javaApi = 'http://192.168.65.249:8001/'
+
axios.defaults.baseURL = javaApi
--
Gitblit v1.9.3