|
|
|
@ -262,30 +262,27 @@ |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-col> |
|
|
|
<el-col :span="4"> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-checkbox v-model="modalData.doesNeedArtwork" true-label="Y">是否需要Artwork</el-checkbox> |
|
|
|
<el-col :span="4" :offset="8"> |
|
|
|
<el-form-item label="设计师"> |
|
|
|
<span slot="label"><a herf="#" @click="getBaseList(2003)">设计师</a></span> |
|
|
|
<el-input v-model="modalData.artworkName"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="4"> |
|
|
|
<el-form-item label=" "> |
|
|
|
|
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="4"> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-checkbox v-model="modalData.doesNeedPlanner" true-label="Y">是否需要计划</el-checkbox> |
|
|
|
<el-form-item label="计划员"> |
|
|
|
<span slot="label"><a herf="#" @click="getBaseList(2004)">计划员</a></span> |
|
|
|
<el-input v-model="modalData.plannerName"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<el-row :gutter="15"> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-col :span="12" v-if="false"> |
|
|
|
<el-form-item style="height: 90px"> |
|
|
|
<span slot="label" @click="getCustomerAddressList"><a>送样地址</a></span> |
|
|
|
<el-input type="textarea" v-model="modalData.sendSamplesAddress" :rows="3" resize='none'></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-col :span="12" v-if="false"> |
|
|
|
<el-form-item label="备注" style="height: 90px"> |
|
|
|
<el-input type="textarea" v-model="modalData.remark" :rows="3" resize='none'></el-input> |
|
|
|
</el-form-item> |
|
|
|
@ -299,6 +296,12 @@ |
|
|
|
</el-form> |
|
|
|
<div class="rq"> |
|
|
|
<el-tabs v-model="activeTab" @tab-click="dialogTabClick"> |
|
|
|
<el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-if="modalData.flag !== '1'"> |
|
|
|
<test-properties v-if="modalFlag" v-model:data-list="testPropertiesList" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-else> |
|
|
|
<test-properties v-if="modalFlag" :show-save-button="modalData.flag !== '1'" v-model:data-list="copyTestPropertiesList" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="物料属性" :disabled="!activeTabList.includes('partAttribute')" name="partAttribute"> |
|
|
|
<test-attribute v-if="modalFlag" :attribute-list="dialogProperties" ref="dialogAttribute" :test-no="modalData.testNo"></test-attribute> |
|
|
|
</el-tab-pane> |
|
|
|
@ -371,9 +374,6 @@ |
|
|
|
<el-tab-pane label="制程信息" :disabled="!activeTabList.includes('process')" name="process"> |
|
|
|
<test-routing-table v-if="clickTestRow" ref="dialogSoRouting" v-model:data-list="testSoRoutingList" :test-no="modalData.testNo"></test-routing-table> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute"> |
|
|
|
<test-properties v-if="modalFlag" v-model:data-list="testPropertiesList" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="附件" :disabled="!activeTabList.includes('file')" name="file"> |
|
|
|
<test-file v-if="modalFlag" :column-list="fileColumnList" v-model:data-list="testFileList" ref="dialogTestFile" :test-no="modalData.testNo"></test-file> |
|
|
|
</el-tab-pane> |
|
|
|
@ -696,6 +696,9 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="基本信息" name="attribute"> |
|
|
|
<test-properties ref="tabProperties" v-model:data-list="testPropertiesList" :test-no="testCurrentRow.testNo" :height="500"></test-properties> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="物料属性" name="test_attribute" style="padding: 5px"> |
|
|
|
<test-attribute ref="tabAttribute" :attribute-list="attributeList" :test-no="testCurrentRow.testNo" :height="500"></test-attribute> |
|
|
|
</el-tab-pane> |
|
|
|
@ -705,9 +708,6 @@ |
|
|
|
<el-tab-pane label="制程信息" name="test_so_routing" style="padding: 5px"> |
|
|
|
<test-routing-table ref="tabSoBom" :test-no="testCurrentRow.testNo" v-model:data-list="testSoRoutingList" :height="500" ></test-routing-table> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="基本信息" name="attribute"> |
|
|
|
<test-properties ref="tabProperties" v-model:data-list="testPropertiesList" :test-no="testCurrentRow.testNo" :height="500"></test-properties> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="附件" name="file"> |
|
|
|
<test-file ref="tabFile" :column-list="fileColumnList" v-model:data-list="testFileList" :test-no="testCurrentRow.testNo" :height="500"></test-file> |
|
|
|
</el-tab-pane> |
|
|
|
@ -1048,7 +1048,7 @@ |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 上传文件的modal --> |
|
|
|
<testUploadFile ref="testUploadFile" @refreshPageTables="getFileContentData()" v-drag></testUploadFile> |
|
|
|
<test-upload-file ref="testUploadFile" @refreshPageTables="getFileContentData()" v-drag></test-upload-file> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
|
|
|
|
@ -1079,14 +1079,9 @@ |
|
|
|
customerContactSearch, // 客户联系人列表查询 |
|
|
|
} from '@/api/customer/customerContact.js' |
|
|
|
import ChooseList from '@/views/modules/common/Chooselist' |
|
|
|
import testUploadFile from "./test_upload_file" |
|
|
|
import TestUploadFile from "./test_upload_file" |
|
|
|
import DictDataSelect from "../sys/dict-data-select.vue"; |
|
|
|
import { |
|
|
|
selectTestSoBom, |
|
|
|
saveTestSoBom, |
|
|
|
removeTestSoBom, |
|
|
|
updateTestSoBom |
|
|
|
} from "../../../api/test/testSoBom"; |
|
|
|
import {selectTestSoBom,} from "../../../api/test/testSoBom"; |
|
|
|
import TestTable from "./testSoBom/testTable.vue"; |
|
|
|
import TestRoutingTable from "./testSoRouting/testRoutingTable.vue"; |
|
|
|
import {selectTestSoRoutingList} from "../../../api/test/testSoRouting"; |
|
|
|
@ -1105,7 +1100,7 @@ |
|
|
|
TestTable, |
|
|
|
DictDataSelect, |
|
|
|
ChooseList, |
|
|
|
testUploadFile |
|
|
|
TestUploadFile |
|
|
|
}, |
|
|
|
watch: { |
|
|
|
searchData: { |
|
|
|
@ -1159,8 +1154,9 @@ |
|
|
|
testSoRoutingList:[], |
|
|
|
testSoBomList:[], |
|
|
|
testPropertiesList:[], |
|
|
|
activeTab:'partAttribute', |
|
|
|
activeTabList:['partAttribute'], |
|
|
|
copyTestPropertiesList:[], |
|
|
|
activeTab:'attribute', |
|
|
|
activeTabList:['attribute'], |
|
|
|
clickTestRow:false, |
|
|
|
// 导出 |
|
|
|
exportData: [], |
|
|
|
@ -1197,7 +1193,7 @@ |
|
|
|
// 其它 |
|
|
|
dataListLoading: false, |
|
|
|
// 初始页签 |
|
|
|
activeTable: 'test_attribute', |
|
|
|
activeTable: 'attribute', |
|
|
|
// ======== 数据对象 ======== |
|
|
|
modalData: { |
|
|
|
flag: '1', |
|
|
|
@ -1217,7 +1213,11 @@ |
|
|
|
priorityLevel: '一般', |
|
|
|
testNumber: 1, |
|
|
|
doesNeedArtwork:'', |
|
|
|
artwork:'', |
|
|
|
artworkName:'', |
|
|
|
doesNeedPlanner:'', |
|
|
|
planner:'', |
|
|
|
plannerName:'', |
|
|
|
requiredDeliveryDate: '', |
|
|
|
remark: '', |
|
|
|
technicalConsiderations: '', |
|
|
|
@ -2327,7 +2327,11 @@ |
|
|
|
projectName: row.projectName, |
|
|
|
tracker: row.tracker, |
|
|
|
doesNeedArtwork:row.doesNeedArtwork, |
|
|
|
artwork:row.artwork, |
|
|
|
artworkName:row.artworkName, |
|
|
|
doesNeedPlanner:row.doesNeedPlanner, |
|
|
|
planner: row.planner, |
|
|
|
plannerName: row.plannerName, |
|
|
|
trackerName: row.trackerName, |
|
|
|
testPartNo: row.testPartNo, |
|
|
|
partName: row.partName, |
|
|
|
@ -2495,7 +2499,7 @@ |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList(); |
|
|
|
this.activeTabList = ['product','process','attribute','partAttribute','file'] |
|
|
|
this.activeTab = 'product' |
|
|
|
this.activeTab = 'attribute' |
|
|
|
this.modalData.testNo = data.row |
|
|
|
// this.modalFlag = false |
|
|
|
this.$message.success("操作成功") |
|
|
|
@ -2930,6 +2934,14 @@ |
|
|
|
strVal = this.modalData.engineerName |
|
|
|
conSql = " and b.site = '" + this.$store.state.user.site + "'" |
|
|
|
} |
|
|
|
if (val === 2003) { |
|
|
|
strVal = this.modalData.artworkName |
|
|
|
conSql = " and b.site = '" + this.$store.state.user.site + "'" |
|
|
|
} |
|
|
|
if (val === 2004) { |
|
|
|
strVal = this.modalData.plannerName |
|
|
|
conSql = " and b.site = '" + this.$store.state.user.site + "'" |
|
|
|
} |
|
|
|
this.$refs.baseList.init(val, strVal, conSql) |
|
|
|
}) |
|
|
|
}, |
|
|
|
@ -2975,6 +2987,14 @@ |
|
|
|
this.modalData.engineer = val.username |
|
|
|
this.modalData.engineerName = val.user_display |
|
|
|
} |
|
|
|
if (this.tagNo === 2003){ |
|
|
|
this.modalData.artwork = val.username; |
|
|
|
this.modalData.artworkName = val.user_display; |
|
|
|
} |
|
|
|
if (this.tagNo === 2004){ |
|
|
|
this.modalData.planner = val.username; |
|
|
|
this.modalData.plannerName = val.user_display; |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
// ======== 导出相关方法 ======== |
|
|
|
@ -3017,7 +3037,11 @@ |
|
|
|
customerDesc: '', |
|
|
|
projectId: '', |
|
|
|
doesNeedArtwork:'', |
|
|
|
artwork:'', |
|
|
|
artworkName:'', |
|
|
|
doesNeedPlanner:'', |
|
|
|
planner: '', |
|
|
|
plannerName: '', |
|
|
|
projectName: '', |
|
|
|
tracker: '', |
|
|
|
trackerName: '', |
|
|
|
@ -3052,9 +3076,10 @@ |
|
|
|
updateDate: '', |
|
|
|
updateBy: '' |
|
|
|
} |
|
|
|
this.activeTab = 'partAttribute'; |
|
|
|
this.activeTabList = ['partAttribute'] |
|
|
|
this.activeTab = 'attribute'; |
|
|
|
this.activeTabList = ['attribute'] |
|
|
|
this.dialogProperties = []; |
|
|
|
this.copyTestPropertiesList = []; |
|
|
|
}, |
|
|
|
checkSelectable(row,index){ |
|
|
|
if (this.modalData.flag === '1' && this.activeTabList.length === 1){ |
|
|
|
|
