From 4db7bd40aa774870c8fb73e5bfc41514ec662923 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 12 一月 2024 10:57:41 +0800
Subject: [PATCH] 包装台账修改
---
/dev/null | 419 --------------------------------------
src/views/quality/packageInspectTemplate/inspect-detail.vue | 35 ++
src/views/quality/packageinspect/packageInspect-form.vue | 5
src/views/quality/finishedProductInspection/index.vue | 4
src/views/plan/manufacturingorder/productorder-form.vue | 26 +
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 5
src/views/quality/processInspect/index.vue | 1
src/views/plan/manufacturingorder/routing.vue | 124 +++++-----
8 files changed, 120 insertions(+), 499 deletions(-)
diff --git a/src/const/defaultPackageInspect.js b/src/const/defaultPackageInspect.js
deleted file mode 100644
index ef8dff4..0000000
--- a/src/const/defaultPackageInspect.js
+++ /dev/null
@@ -1,419 +0,0 @@
-//鍖呰妫�楠岄粯璁ゆ楠岄」
-export const inspect1 = [
- {
- name: "浜у搧鍨嬪彿鏍稿",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "涓庤绠辨竻鍗曞瀷鍙蜂竴鑷�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- }
- ],
- },
- {
- name: "浜у搧鏁伴噺娓呯偣",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "涓庤绠辨竻鍗曟暟閲忎竴鑷�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- }
- ],
- },
- {
- name: "浜у搧鍟уご妫�鏌�",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "涓庤绠辨竻鍗曞唴瀹逛竴鑷达紝绮樿创浜庢樉鐪间綅缃紝娌℃湁鎹熷潖",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- }
- ],
- },
- {
- name: "浜у搧鍖呰妫�鏌�",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "鍚屼竴涓瀷鍙蜂骇鍝佸崟鐙寘瑁�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "杩炲附棰滆壊涓庢枃浠惰姹備竴鑷�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "绾哥浣跨敤閫忔槑鑳跺甫鎴栨媺浼歌啘瑁圭揣",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鏈ㄧ鍐呴儴蹇呴』鍨ソ娉℃搏绾搞�傞拤绱ф湪绠憋紝閽㈠甫鎵庣揣",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "浣跨敤鐝嶇彔妫夋澘鍥哄畾鎻掑ご銆佹彃搴т綅缃紝鍥哄畾鎻掑骇灏剧嚎浣嶇疆锛岀敤鎷夌鑶滃皢浜у搧鍥哄畾鍦ㄧ弽鐝犻潰鏉垮唴",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鍙戝嚭浜у搧涓嶅緱鍑虹幇浠讳綍褰㈠紡鐨勪緵搴斿晢淇℃伅锛屽寘鎷紗鐩樹笂鐨勬爣绛俱�佺數缂嗕笂渚涘簲鍟嗗悕绉扮瓑",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- ],
- },
-]
-
-export const inspect2 = [
- {
- name: "澶栬(娌规紗浠�)",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "娌规紗闈㈡棤鏄庢樉鐮存崯銆佽剰姹＄瓑闂",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- }
- ],
- },
- {
- name: "闆朵欢鍨嬪彿",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "鍚勭被闆朵欢鍨嬪彿婊¤冻瑁呯娓呭崟涓婅瀹氳姹�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- }
- ],
- },
- {
- name: "闆朵欢鏁伴噺",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "鍚勯浂浠舵暟閲忔弧瓒宠绠辨竻鍗曚笂瑙勫畾鐨勮姹�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- }
- ],
- },
- {
- name: "鏈夋晥鏈�",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "瀵逛簬鏈夋湁鏁堟湡鐨勪骇鍝�(鑳舵按銆佸彂娉″墏绛�)锛屾湁鏁堟湡闇�鍓╀綑6涓湀鎴栬��1/2鎬绘湁鏁堟湡",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- }
- ],
- },
- {
- name: "浜у搧鍖呰",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "鎵�鏈夐浂浠跺潎闇�杩涜鍗曠嫭鍖呰(鐗涚毊绾搞�佽嚜灏佽銆佸師瑁呰绛�)",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鍖呰琚嬫棤瑜剁毐銆佺牬鎹熴�佷贡娑備贡鐢伙紝鍘熻琚嬮渶鍘婚櫎浜у搧淇℃伅",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "娌圭姸銆佹恫浣撱�佽啅鐘剁墿闇�鏈夊鏂欑摱鎴栬�呴搧缃愯繘琛屽瘑灏佸寘瑁�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鐢靛瓙鍏冨櫒浠跺寘瑁呴渶鏈夐槻闈欑數鍔熻兘锛屼笖澶栭儴鏈夐槻闇囪姹�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鏈夐槻娼姹傜殑闆朵欢锛屽寘瑁呭唴搴旀坊缃共鐕ュ墏",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "濡備负瀹氬埗鍖栧ぇ鐗╀欢锛岀敤鎷変几鑶滄垨鑰呯弽鐝犳杩涜鍏ㄨ鐩栧寘瑁�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- ],
- },
- {
- name: "浜у搧瑁呯",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "濡傜鍐呯墿鏂欏湪闀垮害銆佸搴︽垨楂樺害鏂瑰悜鍚焊绠辨湪绠卞唴娲诲姩闂撮殭>25mm鏃讹紝闇�澧炲姞閫傞噺濉厖鐗�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "濡備骇鍝佷负鍠锋秱浠堕渶鐢ㄦ场闈㈢弽鐝犳杩涜鍒嗛殧淇濇姢",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鑰愬帇銆佷繚鎶ゆ�т綆鐨勯浂浠跺湪涓嬮儴锛岄渶淇濇姢鐗╁搧鍦ㄤ笂閮�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- ],
- },
- {
- name: "鏍囩鏍囪瘑",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "鏍囩鍐呭姝ｇ‘锛屽寘鍚�(搴忓彿銆侀浂浠舵弿杩般�佹暟閲忋�佸瀷鍙枫�侀」鐩悕绉�)",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鏍囩鍐呭瀛椾綋椤绘竻鏅般�佺粺涓�锛屼笉寰楁湁閲嶅奖銆佷汉涓烘秱鏀�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "涓嶅緱澶氳创鎴栧皯璐达紝鏈夊鍖呰鐨勪骇鍝侊紝鍚屼竴鎵规浜у搧鐨勬爣绛剧矘璐翠綅缃拰鏂瑰悜鍧囦竴鑷�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- ],
- },
- {
- name: "鍞涘ご鏍囪瘑",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "鍞涘ご淇℃伅姝ｇ‘銆佸唴瀹瑰寘鍚�(椤圭洰鍚嶇О銆佷骇鍝佸瀷鍙枫�佽鍗曟棩鏈熴�佺敓浜ф棩鏈熴�佸寘瑁呭昂瀵搞�佹暟閲忋�佸嚭鍘傘�佺紪鍙枫�佸崟浣嶃�侀噸閲�)",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鍞涘ご鍗板埛娓呮櫚锛屾棤閲嶅奖銆佹ā绯娿�佹秱鏀圭瓑闂锛屽垏鍙ｅ钩鏁达紝鏃犲集鏇层�佺毐缂╃瓑鐜拌薄",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "绾哥鍞涘ご绮樿创鍦ㄤ腑闂�1/2H鐨勯珮搴﹀尯闂村唴锛屾í鍚戝眳涓�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鏈ㄧ鍞涘ご鍦ㄦ湪绠变袱渚э紝宸︿笂瑙掑紶璐达紝绂佹灏嗗暓澶寸矘璐翠簬鏈ㄧ鐩栨澘涓�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- ],
- },
- {
- name: "娓呭崟鏍囪瘑",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "娓呭崟淇℃伅鍐呭(椤圭洰鍚嶇О銆佷骇鍝佸悕绉般�佺紪鍙枫�佺鍙�)涓庡敍澶村搴斾竴鑷�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鍞涘ご绮樿创搴斿钩鏁淬�佷笉姝枩銆佷笉缈樿捣銆佽〃闈㈡棤鎹熶激銆佹棤姹℃煋",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鏈ㄧ娓呭崟绮樿创瑕佹眰:娓呭崟濉戝皝鍚庣矘璐村湪鏈ㄧ鍓嶄晶锛屽紶璐翠綅缃负宸︿笂瑙�",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "绾哥娓呭崟绮樿创瑕佹眰:娓呭崟濉戝皝鍚庣矘璐寸焊绠卞墠渚�(鍞涘ご鏃佽竟)",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- ],
- },
- {
- name: "鍏朵粬",
- isEdit: false,
- randomId: Math.random(),
- children: [
- {
- required: "澶栧寘瑁呯焊绠卞皝鍙ｆ椂锛屽鍖呰绠遍暱搴�<700mm鏃讹紝椤堕潰銆佸簳闈㈤噰鐢ㄢ�滃伐鈥濆瓧鍨嬪皝鍙ｏ紝鍖呰绠遍暱搴�>700mm鏃讹紝椤堕潰銆佸簳闈㈤噰鐢ㄢ�滅帇鈥濆瓧鍨嬪皝鍙�(鎴栭噰鐢ㄢ�滃伐鈥濆瓧鍨嬪皝绠�)",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- {
- required: "鏈ㄧ涓�寰嬬敤閽㈠甫鎵撳寘锛屾墦鍖呮柟寮忓崟鎺掑眳涓垨鍙屾帓骞宠锛屾墦鍖呴挗甯﹀簲鍒嗗竷鍧囧寑銆佸钩琛屾帓鏀撅紝涓嶅緱姝枩",
- note: null,
- pid: null,
- presult: null,
- userName: null,
- randomId: Math.random(),
- isEdit: false,
- },
- ],
- },
-]
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index e825e10..0fb9e74 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -154,6 +154,14 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="10">
+ <el-form-item label="宸ヨ壓鏂囦欢" prop="technologyDocumentName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.technologyDocumentName">
+ <el-input v-model="dataForm.technologyDocumentName" placeholder="">
+ </el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
</el-row>
<!-- <el-col
:span="2"
@@ -1193,7 +1201,9 @@
endDate: null,
manufactureAttr: 'N',
isReportOperation: false,
- outPutBatchList: []
+ outPutBatchList: [],
+ technologyDocumentId: null,
+ technologyDocumentName: null,
},
currentRow: [],
currentRouting: {}, // 褰撳墠閫夋嫨鐨勫伐鑹�
@@ -1204,6 +1214,9 @@
operationTemplateList: [], // 鍙傛暟闆�
templateParamList: [], // 鍙傛暟
dataRule: {
+ technologyDocumentName:[
+ { required: true, message: '宸ヨ壓鏂囦欢涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
workshopTypeCode: [
{ required: true, message: '杞﹂棿璁㈠崟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }
],
@@ -1522,13 +1535,7 @@
checkPart(value, this.dataForm.workshopTypeCode)
.then((response) => {
const manufacturingOrderDTO = response.data.data
- /* this.dataForm.routingList = manufacturingOrderDTO.routingList.filter(
- (e) => e.bomTypeDb === this.dataForm.workshopTypeCode
- ) */
this.dataForm.routingList = manufacturingOrderDTO.routingList
- /* this.dataForm.bomList = manufacturingOrderDTO.bomList.filter(
- (e) => e.bomTypeDb === this.dataForm.workshopTypeCode
- ) */
this.dataForm.bomList = manufacturingOrderDTO.bomList
this.dataForm.technologyRoutingId =
manufacturingOrderDTO.technologyRoutingId
@@ -1664,10 +1671,13 @@
this.showRouting = true
},
selectRouting(param) {
+ console.log(param);
if (param) {
this.dataForm.partNo = param.partNo
this.dataForm.partName = param.partName
this.dataForm.partId = param.partId
+ this.dataForm.technologyDocumentId = param.id
+ this.dataForm.technologyDocumentName = param.name
this.$refs.dataForm.validateField('partId', (valid) => {})
}
},
@@ -1687,6 +1697,8 @@
})
},
// 2.tabs-宸ヨ壓璺嚎
+ //宸ヨ壓鏂囦欢閫夋嫨
+
// 宸ヨ壓璺嚎閫夋嫨
routingSelectChanged(routingId) {
this.currentRouting = this.dataForm.routingList.find(
diff --git a/src/views/plan/manufacturingorder/routing.vue b/src/views/plan/manufacturingorder/routing.vue
index 51d1794..c5048e3 100644
--- a/src/views/plan/manufacturingorder/routing.vue
+++ b/src/views/plan/manufacturingorder/routing.vue
@@ -31,7 +31,7 @@
</el-dialog>
</template>
<script>
-import { fetchList } from '@/api/technology/routing'
+import { fetchList } from '@/api/technology/document'
import ttable from '@/views/common/ztt-table.vue'
import { remote } from '@/api/admin/dict'
export default {
@@ -73,12 +73,12 @@
border: true, // 鏄惁鏈夌旱鍚戣竟妗�
lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
- multiSelect: false, //
+ multiSelect: true, //
seqNo: true,
isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
- isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
- isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
- defaultOrderBy: { column: 'updateTime', direction: 'desc' }
+ isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳H
+ isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
total: 0,
@@ -89,62 +89,62 @@
column: [
{
minWidth: '100',
- prop: 'routingNo',
- label: '宸ヨ壓缂栧彿',
+ prop: 'number',
+ label: '鏂囦欢缂栧彿',
sort: true,
isTrue: true,
isSearch: true,
searchInfoType: 'text'
},
+ {
+ minWidth: '100',
+ prop: 'name',
+ label: '鏂囦欢鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ // 宸ヨ壓绫诲瀷
+ // {
+ // minWidth: '120',
+ // prop: 'bomTypeDb',
+ // label: '宸ヨ壓绫诲瀷',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: false,
+ // searchInfoType: 'select',
+ // formatter: this.formatBomTypeDbType,
+ // optList: () => {
+ // return this.bomTypeDbOptions
+ // }
+ // },
// {
// minWidth: '100',
- // prop: 'name',
- // label: '宸ヨ壓鍚嶇О',
+ // prop: 'master',
+ // label: '涓诲伐鑹�',
// sort: true,
// isTrue: true,
// isSearch: true,
- // searchInfoType: 'text'
+ // searchInfoType: 'select',
+ // formatter: this.getMaster,
+ // optList: () => {
+ // return this.getMasterList()
+ // }
// },
- // 宸ヨ壓绫诲瀷
- {
- minWidth: '120',
- prop: 'bomTypeDb',
- label: '宸ヨ壓绫诲瀷',
- sort: true,
- isTrue: true,
- isSearch: false,
- searchInfoType: 'select',
- formatter: this.formatBomTypeDbType,
- optList: () => {
- return this.bomTypeDbOptions
- }
- },
- {
- minWidth: '100',
- prop: 'master',
- label: '涓诲伐鑹�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.getMaster,
- optList: () => {
- return this.getMasterList()
- }
- },
- {
- minWidth: '100',
- prop: 'state',
- label: '鐘舵��',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.getMasterState,
- optList: () => {
- return this.getMasterStateList()
- }
- },
+ // {
+ // minWidth: '100',
+ // prop: 'state',
+ // label: '鐘舵��',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.getMasterState,
+ // optList: () => {
+ // return this.getMasterStateList()
+ // }
+ // },
{
minWidth: '100',
prop: 'description',
@@ -154,16 +154,16 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '120',
- prop: 'partName',
- label: '闆朵欢鍚�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- noShowTip: false
- },
+ // {
+ // minWidth: '120',
+ // prop: 'partName',
+ // label: '闆朵欢鍚�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text',
+ // noShowTip: false
+ // },
{
minWidth: '120',
prop: 'partNo',
@@ -202,7 +202,7 @@
label: '鑽夌'
},
{
- value: '02accepted',
+ value: '02pending',
label: '宸叉帴鍙�'
},
{
@@ -285,7 +285,7 @@
currshowlist() {
this.innerVisible = this.currshowlist
if (this.currshowlist) {
- this.queryParam.state = '02accepted'
+ this.queryParam.state = '03accepted'
this.$nextTick(() => {
this.getData()
})
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 02dc40e..d2354d9 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -349,7 +349,7 @@
}
},
codeDevice(row,index){
- this.row=row
+ this.row=row
console.log("row",row);
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
@@ -440,6 +440,7 @@
this.processInspectVo.documentId = result.documentId
this.processInspectVo.outBatchNo = result.outBatchNo
this.processInspectVo.locName = result.locName
+ this.processInspectVo.productNo = result.productNo
let userList = []
result.children.forEach(item=>{
item.iid = Math.random()
@@ -626,7 +627,7 @@
updateFinishedInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.init()
- }
+ }
})
}
})
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 6a959ab..a5a809e 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -108,7 +108,6 @@
},
{
minWidth: '130',
- width: '150',
prop: 'projectName',
label: '宸ョ▼鍚嶇О',
sort: true,
@@ -134,8 +133,9 @@
},
{
minWidth: '120',
+ width: '150',
prop: 'material',
- label: '浜у搧澶х被',
+ label: '浜у搧鍚嶇О',
isTrue: true,
isSearch: true,
searchInfoType: 'text'
diff --git a/src/views/quality/packageInspectTemplate/inspect-detail.vue b/src/views/quality/packageInspectTemplate/inspect-detail.vue
index 1e9988a..fd7ae5e 100644
--- a/src/views/quality/packageInspectTemplate/inspect-detail.vue
+++ b/src/views/quality/packageInspectTemplate/inspect-detail.vue
@@ -14,6 +14,20 @@
@row-save="addInspectHandler"
@row-del="delInspectHandler"
:page="page">
+ <template slot="inspectNameForm" slot-scope="scope">
+ <el-input
+ placeholder="璇疯緭鍏ユ楠岄」鐩悕绉�"
+ type="textarea"
+ v-model="scope.row.inspectName"
+ :rows="2" />
+ </template>
+ <template slot="inspectRequiredForm" slot-scope="scope">
+ <el-input
+ placeholder="璇疯緭鍏ユ楠屾爣鍑�"
+ type="textarea"
+ v-model="scope.row.inspectRequired"
+ :rows="2" />
+ </template>
<template #menu="{size,row,index}">
<el-button v-if="row.children!=null" class="menu-button" :size="size" @click="addChildren(size,row,index)" type="text" icon="el-icon-circle-plus-outline">娣诲姞瀛愰」鐩�</el-button>
<el-button v-if="row.children==null" class="menu-button" :size="size" @click="showUpdateDialog(size,row,index)" type="text" icon="el-icon-edit">缂栬緫</el-button>
@@ -71,7 +85,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="addChildrenVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="addInspectHandler">纭� 瀹�</el-button>
+ <el-button type="primary" @click="addChildrenHandler">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -164,9 +178,24 @@
},
methods:{
addChildren(size,row,index){
- console.log(row);
this.addChildrenForm.inspectName = row.inspectName
this.addChildrenVisible = true
+ },
+ addInspectHandler(row,done,loading){
+ const _than = this
+ let obj = {
+ parentId: this.paramObj.id,
+ ...row
+ }
+ addInspect(obj).then(res=>{
+ if(res.status===200){
+ _than.getData()
+ _than.$message.success("娣诲姞鎴愬姛")
+ }
+ }).catch(error=>{
+ console.error(error)
+ })
+ done()
},
delInspectHandler(size,row,index){
const _than = this
@@ -208,7 +237,7 @@
}
})
},
- addInspectHandler(){
+ addChildrenHandler(){
const _than = this
this.$refs.addChildrenForm.validate(valid=>{
if(valid){
diff --git a/src/views/quality/packageinspect/packageInspect-form.vue b/src/views/quality/packageinspect/packageInspect-form.vue
index 5d87540..873dc2b 100644
--- a/src/views/quality/packageinspect/packageInspect-form.vue
+++ b/src/views/quality/packageinspect/packageInspect-form.vue
@@ -66,7 +66,7 @@
<el-row :gutter="10" style="width:100%;z-index: 10;height:30px;">
<el-col :span="12">妫�楠岄」鐩�</el-col>
<el-col :span="12" style="text-align: right;">
- <el-dropdown @command="handleCommand" v-if="!isShow && resultVal==null">
+ <el-dropdown @command="handleCommand" v-if="isShow">
<el-button size="mini" style="margin-right: 10px;" type="primary" >
鍒囨崲妫�楠岄」妯℃澘<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
@@ -195,7 +195,6 @@
getCustomer,
} from '@/api/quality/packageInspect'
import {getAllTemplateByEnable} from '@/api/quality/packageInspectTemp'
-import {inspect1,inspect2} from '@/const/defaultPackageInspect'
export default {
computed:{
},
@@ -204,7 +203,7 @@
data(){
return{
inspectMoulds: [],
- isShow: false,
+ isShow: true,
submitData: {
id:null,
result: null,
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 2ccb642..5e630a0 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -90,7 +90,6 @@
},
{
minWidth: '130',
- width: '150',
prop: 'specs',
label: '瑙勬牸鍨嬪彿',
sort: true,
--
Gitblit v1.9.3