wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-12-20 修改

master
fengyuan_yang 2 years ago
parent
33a7e5c9ad
commit
b6337c9a5f
9 changed files with 1505 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/views/modules/part/bomManagement.vue
  2. 4
      src/views/modules/part/partInformation.vue
  3. 2
      src/views/modules/part/routingManagement.vue
  4. 14
      src/views/modules/proofing/batchRequestForProofing.vue
  5. 52
      src/views/modules/proofing/requestForProofing.vue
  6. 14
      src/views/modules/quotation/batchRequestForQuote.vue
  7. 16
      src/views/modules/quotation/requestForQuote.vue
  8. 1431
      src/views/modules/test/batchRequestForTest.vue
  9. 52
      src/views/modules/test/requestForTest.vue

15
src/views/modules/part/bomManagement.vue
View File

@ -98,6 +98,9 @@
<el-form-item :label="'制造类型'" prop="bomType" :rules="rules.bomType"> <el-form-item :label="'制造类型'" prop="bomType" :rules="rules.bomType">
<el-select v-model="modalData.bomType" :disabled="modalDisableFlag" style="width: 221px"> <el-select v-model="modalData.bomType" :disabled="modalDisableFlag" style="width: 221px">
<el-option label="Manufacturing" value="Manufacturing"></el-option> <el-option label="Manufacturing" value="Manufacturing"></el-option>
<el-option label="ManufacturedRecipe" value="ManufacturedRecipe"></el-option>
<el-option label="PurchaseRaw" value="PurchaseRaw"></el-option>
<el-option label="Purchased" value="Purchased"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="'类型'" prop="typeFlag" :rules="rules.typeFlag">--> <!-- <el-form-item :label="'类型'" prop="typeFlag" :rules="rules.typeFlag">-->
@ -384,13 +387,9 @@
</el-form-item> </el-form-item>
<el-form-item :label="'生产属性'" prop="issueType" :rules="componentRules.issueType"> <el-form-item :label="'生产属性'" prop="issueType" :rules="componentRules.issueType">
<el-select v-model="componentData.issueType" clearable style="width: 142px"> <el-select v-model="componentData.issueType" clearable style="width: 142px">
<el-option label="领退料倒冲" value="A"></el-option>
<el-option label="工单倒冲" value="B"></el-option>
<el-option label="生产订单倒冲" value="C"></el-option>
<el-option label="投料倒冲" value="D"></el-option>
<el-option label="批次倒冲" value="E"></el-option>
<el-option label="销售订单倒冲" value="F"></el-option>
<el-option label="项目倒冲" value="G"></el-option>
<el-option label="ReserveAndBackflush" value="ReserveAndBackflush"></el-option>
<el-option label="Reserve" value="Reserve"></el-option>
<el-option label="Backflush" value="Backflush"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -1543,7 +1542,7 @@ export default {
printUnitName: '', printUnitName: '',
qtyPerAssembly: 0, qtyPerAssembly: 0,
componentScrap: 0, componentScrap: 0,
issueType: '',
issueType: 'ReserveAndBackflush',
shrinkageFactor: 0, shrinkageFactor: 0,
lineItemNo: '', lineItemNo: '',
operationName: '', operationName: '',

4
src/views/modules/part/partInformation.vue
View File

@ -135,11 +135,11 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="familyName" :rules="rules.familyName"> <el-form-item prop="familyName" :rules="rules.familyName">
<span slot="label" @click="getBaseList(108)"><a herf="#">材料分类1</a></span>
<span slot="label" @click="getBaseList(108)"><a herf="#">材料分类</a></span>
<el-input v-model="modalData.familyName" style="width: 221px"></el-input> <el-input v-model="modalData.familyName" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="groupName" :rules="rules.groupName"> <el-form-item prop="groupName" :rules="rules.groupName">
<span slot="label" @click="getBaseList(109)"><a herf="#">材料分类2</a></span>
<span slot="label" @click="getBaseList(109)"><a herf="#">材料分组</a></span>
<el-input v-model="modalData.groupName" style="width: 221px"></el-input> <el-input v-model="modalData.groupName" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>

2
src/views/modules/part/routingManagement.vue
View File

@ -98,6 +98,8 @@
<el-form-item :label="'工艺类型'" prop="routingType" :rules="rules.routingType"> <el-form-item :label="'工艺类型'" prop="routingType" :rules="rules.routingType">
<el-select v-model="modalData.routingType" :disabled="modalDisableFlag" style="width: 221px"> <el-select v-model="modalData.routingType" :disabled="modalDisableFlag" style="width: 221px">
<el-option label="Manufacturing" value="Manufacturing"></el-option> <el-option label="Manufacturing" value="Manufacturing"></el-option>
<el-option label="Repair" value="Repair"></el-option>
<el-option label="Prototype" value="Prototype"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>

14
src/views/modules/proofing/batchRequestForProofing.vue
View File

@ -158,10 +158,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="打样结果信息" prop="proofingResultInformation" :rules="enterResultRules.proofingResultInformation"> <el-form-item label="打样结果信息" prop="proofingResultInformation" :rules="enterResultRules.proofingResultInformation">
<el-input type="textarea" v-model="enterResultData.proofingResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
<el-input type="textarea" v-model="enterResultData.proofingResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
<el-form :inline="true" label-position="top" style="margin-top: 5px"> <el-form :inline="true" label-position="top" style="margin-top: 5px">
<el-button type="primary" @click="uploadFile()">上传文件</el-button> <el-button type="primary" @click="uploadFile()">上传文件</el-button>
</el-form> </el-form>
@ -198,7 +198,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-footer style="height:35px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveProofingResult()">保存</el-button> <el-button type="primary" @click="saveProofingResult()">保存</el-button>
<el-button type="primary" @click="closeProofingResultModal()">关闭</el-button> <el-button type="primary" @click="closeProofingResultModal()">关闭</el-button>
</el-footer> </el-footer>
@ -221,10 +221,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="提交备注"> <el-form-item label="提交备注">
<el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
<el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveSubmitResult()">保存</el-button> <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
<el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button> <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -248,10 +248,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="客户回复信息"> <el-form-item label="客户回复信息">
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveCustomerResponse()">保存</el-button> <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
<el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button> <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
</el-footer> </el-footer>

52
src/views/modules/proofing/requestForProofing.vue
View File

@ -194,7 +194,7 @@
<input type="checkbox" value="Y" name="sendSamples" v-model="modalData.isNeedToSendSamples"/> <input type="checkbox" value="Y" name="sendSamples" v-model="modalData.isNeedToSendSamples"/>
</el-form-item> </el-form-item>
<el-form-item label="送样地址"> <el-form-item label="送样地址">
<el-input v-model="modalData.sendSamplesAddress" style="width: 356px"></el-input>
<el-input v-model="modalData.sendSamplesAddress" style="width: 369px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="modalData.remark" style="width: 456px"></el-input> <el-input v-model="modalData.remark" style="width: 456px"></el-input>
@ -202,18 +202,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="技术注意事项"> <el-form-item label="技术注意事项">
<el-input
type="textarea"
v-model="modalData.technicalConsiderations"
:rows="1"
resize='none'
maxlength="300"
show-word-limit
style="width: 456px;height: 20px">
</el-input>
<el-input type="textarea" v-model="modalData.technicalConsiderations" :rows="3" resize='none' show-word-limit style="width: 456px;height: 20px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:30px;margin-top: 20px;text-align:center">
<el-footer style="height:30px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button> <el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button> <el-button type="primary" @click="modalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -228,10 +220,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="打样结果信息" prop="proofingResultInformation" :rules="enterResultRules.proofingResultInformation"> <el-form-item label="打样结果信息" prop="proofingResultInformation" :rules="enterResultRules.proofingResultInformation">
<el-input type="textarea" v-model="enterResultData.proofingResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
<el-input type="textarea" v-model="enterResultData.proofingResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
<el-form :inline="true" label-position="top" style="margin-top: 5px"> <el-form :inline="true" label-position="top" style="margin-top: 5px">
<el-button type="primary" @click="uploadFile()">上传文件</el-button> <el-button type="primary" @click="uploadFile()">上传文件</el-button>
</el-form> </el-form>
@ -268,7 +260,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-footer style="height:35px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveProofingResult()">保存</el-button> <el-button type="primary" @click="saveProofingResult()">保存</el-button>
<el-button type="primary" @click="enterResultModalFlag = false">关闭</el-button> <el-button type="primary" @click="enterResultModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -293,10 +285,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="送货备注"> <el-form-item label="送货备注">
<el-input type="textarea" v-model="submitResultData.deliverGoodsRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
<el-input type="textarea" v-model="submitResultData.deliverGoodsRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveSubmitResult()">保存</el-button> <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
<el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button> <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -320,10 +312,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="客户回复信息"> <el-form-item label="客户回复信息">
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveCustomerResponse()">保存</el-button> <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
<el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button> <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -389,16 +381,7 @@
<el-tab-pane label="打样详细信息" name="proofing_detail_information"> <el-tab-pane label="打样详细信息" name="proofing_detail_information">
<el-form :inline="true" label-position="top" :model="proofingDetailData" style="margin-left: 10px;margin-top: 10px;"> <el-form :inline="true" label-position="top" :model="proofingDetailData" style="margin-left: 10px;margin-top: 10px;">
<el-form-item label="技术注意事项"> <el-form-item label="技术注意事项">
<el-input
type="textarea"
v-model="proofingDetailData.technicalConsiderations"
readonly
:rows="3"
resize='none'
maxlength="300"
show-word-limit
style="width: 600px;height: 30px">
</el-input>
<el-input type="textarea" v-model="proofingDetailData.technicalConsiderations" readonly :rows="3" resize='none' show-word-limit style="width: 600px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="proofingDetailData" style="margin-left: 10px;margin-top: 46px;"> <el-form :inline="true" label-position="top" :model="proofingDetailData" style="margin-left: 10px;margin-top: 46px;">
@ -1769,12 +1752,19 @@
this.pageSize = data.page.pageSize this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length) this.$refs.selectDiv.setLengthAll( this.dataList.length)
//判断是否全部存在数据
if(this.totalPage > 0){
// 判断是否全部存在数据
if (this.totalPage > 0) {
//设置选中行 //设置选中行
this.$refs.proofingTable.setCurrentRow(this.dataList[0]) this.$refs.proofingTable.setCurrentRow(this.dataList[0])
this.refreshCurrentTabTable() //加载当前的页签的table
//加载当前的页签的table
this.refreshCurrentTabTable()
this.proofingClickRow(this.dataList[0]) this.proofingClickRow(this.dataList[0])
} else {
//设置选中行
this.$refs.proofingTable.setCurrentRow({})
// 加载当前的页签的table
this.refreshCurrentTabTable()
this.testClickRow({})
} }
} }
this.dataListLoading = false this.dataListLoading = false

14
src/views/modules/quotation/batchRequestForQuote.vue
View File

@ -158,10 +158,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="询价结果信息" prop="quotationResultInformation" :rules="enterResultRules.quotationResultInformation"> <el-form-item label="询价结果信息" prop="quotationResultInformation" :rules="enterResultRules.quotationResultInformation">
<el-input type="textarea" v-model="enterResultData.quotationResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
<el-input type="textarea" v-model="enterResultData.quotationResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
<el-form :inline="true" label-position="top" style="margin-top: 5px"> <el-form :inline="true" label-position="top" style="margin-top: 5px">
<el-button type="primary" @click="uploadFile()">上传文件</el-button> <el-button type="primary" @click="uploadFile()">上传文件</el-button>
</el-form> </el-form>
@ -198,7 +198,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-footer style="height:35px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveQuotationResult()">保存</el-button> <el-button type="primary" @click="saveQuotationResult()">保存</el-button>
<el-button type="primary" @click="closeQuotationResultModal()">关闭</el-button> <el-button type="primary" @click="closeQuotationResultModal()">关闭</el-button>
</el-footer> </el-footer>
@ -221,10 +221,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="提交备注"> <el-form-item label="提交备注">
<el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
<el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveSubmitResult()">保存</el-button> <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
<el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button> <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -248,10 +248,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="客户回复信息"> <el-form-item label="客户回复信息">
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveCustomerResponse()">保存</el-button> <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
<el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button> <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
</el-footer> </el-footer>

16
src/views/modules/quotation/requestForQuote.vue
View File

@ -201,7 +201,6 @@
v-model="modalData.technicalConsiderations" v-model="modalData.technicalConsiderations"
:rows="1" :rows="1"
resize='none' resize='none'
maxlength="300"
show-word-limit show-word-limit
style="width: 456px;height: 20px"> style="width: 456px;height: 20px">
</el-input> </el-input>
@ -222,10 +221,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="询价结果信息" prop="quotationResultInformation" :rules="enterResultRules.quotationResultInformation"> <el-form-item label="询价结果信息" prop="quotationResultInformation" :rules="enterResultRules.quotationResultInformation">
<el-input type="textarea" v-model="enterResultData.quotationResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
<el-input type="textarea" v-model="enterResultData.quotationResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
<el-form :inline="true" label-position="top" style="margin-top: 5px"> <el-form :inline="true" label-position="top" style="margin-top: 5px">
<el-button type="primary" @click="uploadFile()">上传文件</el-button> <el-button type="primary" @click="uploadFile()">上传文件</el-button>
</el-form> </el-form>
@ -262,7 +261,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-footer style="height:35px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveQuotationResult()">保存</el-button> <el-button type="primary" @click="saveQuotationResult()">保存</el-button>
<el-button type="primary" @click="enterResultModalFlag = false">关闭</el-button> <el-button type="primary" @click="enterResultModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -285,10 +284,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="提交备注"> <el-form-item label="提交备注">
<el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
<el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveSubmitResult()">保存</el-button> <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
<el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button> <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -312,10 +311,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="客户回复信息"> <el-form-item label="客户回复信息">
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveCustomerResponse()">保存</el-button> <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
<el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button> <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -387,7 +386,6 @@
readonly readonly
:rows="3" :rows="3"
resize='none' resize='none'
maxlength="300"
show-word-limit show-word-limit
style="width: 600px;height: 30px"> style="width: 600px;height: 30px">
</el-input> </el-input>

1431
src/views/modules/test/batchRequestForTest.vue
File diff suppressed because it is too large
View File

52
src/views/modules/test/requestForTest.vue
View File

@ -194,7 +194,7 @@
<input type="checkbox" value="Y" name="sendSamples" v-model="modalData.isNeedToSendSamples"/> <input type="checkbox" value="Y" name="sendSamples" v-model="modalData.isNeedToSendSamples"/>
</el-form-item> </el-form-item>
<el-form-item label="送样地址"> <el-form-item label="送样地址">
<el-input v-model="modalData.sendSamplesAddress" style="width: 356px"></el-input>
<el-input v-model="modalData.sendSamplesAddress" style="width: 369px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="modalData.remark" style="width: 456px"></el-input> <el-input v-model="modalData.remark" style="width: 456px"></el-input>
@ -202,18 +202,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="技术注意事项"> <el-form-item label="技术注意事项">
<el-input
type="textarea"
v-model="modalData.technicalConsiderations"
:rows="1"
resize='none'
maxlength="300"
show-word-limit
style="width: 456px;height: 20px">
</el-input>
<el-input type="textarea" v-model="modalData.technicalConsiderations" :rows="3" resize='none' show-word-limit style="width: 456px;height: 20px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:30px;margin-top: 20px;text-align:center">
<el-footer style="height:30px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button> <el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button> <el-button type="primary" @click="modalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -228,10 +220,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="测试结果信息" prop="testResultInformation" :rules="enterResultRules.testResultInformation"> <el-form-item label="测试结果信息" prop="testResultInformation" :rules="enterResultRules.testResultInformation">
<el-input type="textarea" v-model="enterResultData.testResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
<el-input type="textarea" v-model="enterResultData.testResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
<el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
<el-form :inline="true" label-position="top" style="margin-top: 5px"> <el-form :inline="true" label-position="top" style="margin-top: 5px">
<el-button type="primary" @click="uploadFile()">上传文件</el-button> <el-button type="primary" @click="uploadFile()">上传文件</el-button>
</el-form> </el-form>
@ -268,7 +260,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-footer style="height:35px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveTestResult()">保存</el-button> <el-button type="primary" @click="saveTestResult()">保存</el-button>
<el-button type="primary" @click="enterResultModalFlag = false">关闭</el-button> <el-button type="primary" @click="enterResultModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -293,10 +285,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="送货备注"> <el-form-item label="送货备注">
<el-input type="textarea" v-model="submitResultData.deliverGoodsRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
<el-input type="textarea" v-model="submitResultData.deliverGoodsRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveSubmitResult()">保存</el-button> <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
<el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button> <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -320,10 +312,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;"> <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
<el-form-item label="客户回复信息"> <el-form-item label="客户回复信息">
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
<el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-footer style="height:35px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveCustomerResponse()">保存</el-button> <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
<el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button> <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
</el-footer> </el-footer>
@ -389,16 +381,7 @@
<el-tab-pane label="测试详细信息" name="test_detail_information"> <el-tab-pane label="测试详细信息" name="test_detail_information">
<el-form :inline="true" label-position="top" :model="testDetailData" style="margin-left: 10px;margin-top: 10px;"> <el-form :inline="true" label-position="top" :model="testDetailData" style="margin-left: 10px;margin-top: 10px;">
<el-form-item label="技术注意事项"> <el-form-item label="技术注意事项">
<el-input
type="textarea"
v-model="testDetailData.technicalConsiderations"
readonly
:rows="3"
resize='none'
maxlength="300"
show-word-limit
style="width: 600px;height: 30px">
</el-input>
<el-input type="textarea" v-model="testDetailData.technicalConsiderations" readonly :rows="3" resize='none' show-word-limit style="width: 600px;height: 30px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="testDetailData" style="margin-left: 10px;margin-top: 46px;"> <el-form :inline="true" label-position="top" :model="testDetailData" style="margin-left: 10px;margin-top: 46px;">
@ -1769,12 +1752,19 @@
this.pageSize = data.page.pageSize this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length) this.$refs.selectDiv.setLengthAll( this.dataList.length)
//判断是否全部存在数据
if(this.totalPage > 0){
// 判断是否全部存在数据
if (this.totalPage > 0) {
//设置选中行 //设置选中行
this.$refs.testTable.setCurrentRow(this.dataList[0]) this.$refs.testTable.setCurrentRow(this.dataList[0])
this.refreshCurrentTabTable() //加载当前的页签的table
// 加载当前的页签的table
this.refreshCurrentTabTable()
this.testClickRow(this.dataList[0]) this.testClickRow(this.dataList[0])
} else {
//设置选中行
this.$refs.testTable.setCurrentRow({})
// 加载当前的页签的table
this.refreshCurrentTabTable()
this.testClickRow({})
} }
} }
this.dataListLoading = false this.dataListLoading = false

Write Preview
Loading…
Cancel
Save