From 41e0df8413624e6034c967f3afae30da59370879 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 十二月 2023 16:20:15 +0800
Subject: [PATCH] modified: src/components/verifition/Verify/VerifyPoints.vue modified: src/const/crud/admin/sys-public-param.js modified: src/page/full-screen/fullScreenPlus.vue modified: src/page/index/logo.vue modified: src/page/index/sidebar/sidebarItem.vue modified: src/page/login/index.vue modified: src/page/login/thirdpartylogin.vue modified: src/util/elAttr.js modified: src/views/accounting/unitworkfactor/unitworkfactor-form.vue modified: src/views/accounting/unitworkfactor/updateQuota-form.vue modified: src/views/basic/discmaintenance/discmaintenance-form.vue modified: src/views/basic/log/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/basic/part/print-label-form.vue modified: src/views/basic/poc/index.vue modified: src/views/basic/tabletest/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/template/template-form.vue modified: src/views/basic/workstation/workstation-form.vue modified: src/views/common/custom-table.vue modified: src/views/common/documentDetail.vue modified: src/views/common/operationParamTemplate.vue modified: src/views/common/rawMaterial-part.vue modified: src/views/common/search-select.vue modified: src/views/common/ztt-table.vue modified: src/views/huawei/code19bind/list.vue modified: src/views/huawei/code19gen/form.vue modified: src/views/huawei/grossweightcode/list.vue modified: src/views/huawei/grossweightcode/task-secret-form.vue modified: src/views/oa/JiegouModal.vue modified: src/views/oa/PeizhiModal.vue modified: src/views/oa/technology-document-new.vue modified: src/views/oa/technology-document.vue modified: src/views/plan/customer/index.vue modified: src/views/plan/customerorder/confirm-pull-customerorder.vue modified: src/views/plan/customerorder/customerorder-config-history.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/customerorder-return.vue modified: src/views/plan/customerorder/customerorder-ztt-table.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/other-customer-order-line.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/manufacturingorder/customerorder.vue modified: src/views/plan/manufacturingorder/customize-param-template.vue modified: src/views/plan/manufacturingorder/order-operation-form.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/manufacturingorderapply/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue modified: src/views/plan/operationtask/gantt.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/plan/operationtask/task-material.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/plan/productionschedul/template-form.vue modified: src/views/plan/schedule/gantt.vue modified: src/views/plan/schedulelookover/ganttview.vue modified: src/views/plan/segmentmerge/index.vue modified: src/views/plan/segmentmerge/operate-dialog.vue modified: src/views/plan/segmentmerge/operation-technology-form.vue modified: src/views/product/dutyrecord/index.vue modified: src/views/product/producttraceability/index.vue modified: src/views/product/producttraceability/traceability-diagram.vue modified: src/views/product/workbench/batchproductout-form-new.vue modified: src/views/product/workbench/batchproductout-form.vue modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/product/workbench/feed-tab.vue modified: src/views/product/workbench/handymantype.vue modified: src/views/product/workbench/index.vue modified: src/views/product/workbench/mould-pane.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/product-record-form.vue modified: src/views/product/workbench/productout-form-by-batch.vue modified: src/views/product/workbench/productout-form.vue modified: src/views/product/workbench/productrecord-tab.vue modified: src/views/product/workbench/producttracking-tab.vue modified: src/views/product/workbench/shift-productout-form.vue modified: src/views/product/workbench/splitTaskForm.vue modified: src/views/product/workbench/taskinfo-pane.vue modified: src/views/quality/Packaging_ledger/pack-from.vue modified: src/views/quality/apply/index.vue modified: src/views/quality/exception/exception.vue modified: src/views/quality/exception/index.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/finishedProduct-print.vue modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/newReport/ReportForm.vue modified: src/views/quality/processInspect/index.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/processconfiguration/table-form.vue modified: src/views/quality/rawMaterial/QrcodeReader.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/report/index.vue modified: src/views/quality/standardbind/standardbind-form.vue modified: src/views/quality/statistics/rateChart.vue modified: src/views/quality/testitemlayout/index.vue modified: src/views/quality/testplan/testplan-form.vue modified: src/views/quality/unqualifiedprocess/examineApproveform.vue modified: src/views/quality/unqualifiedprocess/index.vue modified: src/views/quality/unqualifiedprocess/loaction-form.vue modified: src/views/quality/unqualifiedprocess/unqualifiedprocessform.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/checkStandardTable.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/extendsOperation.vue modified: src/views/technology/document/extendsTestStandard.vue modified: src/views/technology/document/extendsTestStandardParam.vue modified: src/views/technology/document/teststandard.vue modified: src/views/technology/structure/single-structure-form.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/check/check-detail.vue modified: src/views/warehouse/pallettransports/ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifsstock-form.vue modified: src/views/warehouse/pallettransports/index.vue modified: src/views/warehouse/returnstock/ifslocation-form.vue modified: src/views/warehouse/returnstock/index.vue modified: src/views/warehouse/returnstock/returnstock-form.vue modified: src/views/warehouse/returnstock/stock-part.vue modified: src/views/warehouse/stock/print-label-form.vue modified: src/views/warehouse/stock/small-print-label-form.vue modified: src/views/warehouse/stock/small-warehousing-label-form.vue modified: src/views/warehouse/stock/stock-table.vue modified: src/views/warehouse/stock/warehousing-label-form.vue modified: src/views/zte/pkgidbind/index.vue
---
src/views/plan/manufacturingorder/customerorder.vue | 306 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 269 insertions(+), 37 deletions(-)
diff --git a/src/views/plan/manufacturingorder/customerorder.vue b/src/views/plan/manufacturingorder/customerorder.vue
index 8cc4949..81fa5d7 100644
--- a/src/views/plan/manufacturingorder/customerorder.vue
+++ b/src/views/plan/manufacturingorder/customerorder.vue
@@ -22,18 +22,18 @@
@keyup.enter.native="dataFormSubmit()"
label-width="100px"
class="l-mes productorder-order"
- :disabled="!editable"
>
- <el-tabs type="border-card">
+ <!-- :disabled="!editable" -->
+ <el-tabs type="border-card" @tab-click="downs" v-model="activeFileName">
<el-tab-pane label="涓昏" type="card">
<el-row>
<el-col :span="12">
<el-form-item label="鍚屾鏁版嵁鏉ユ簮" prop="sourceId">
- <el-input
- v-model="dataForm.sourceId"
- placeholder=""
- :disabled="!ediSource"
- ></el-input>
+ <el-input
+ v-model="dataForm.sourceId == 0 ? '鍚屾' : '鎵嬪姩'"
+ placeholder=""
+ disabled
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -86,7 +86,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="琛屽彿" prop="coLineNo">
<el-input
v-model="dataForm.coLineNo"
@@ -94,7 +94,17 @@
:disabled="!ediSource"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
+ <el-col :span="6">
+ <el-form-item label="浜у搧鍚嶇О" prop="productName">
+ <el-input
+ v-model="dataForm.productName"
+ placeholder=""
+ disabled
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="12">
@@ -121,9 +131,9 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="wantedDeliveryDate">
+ <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="deliveryDate">
<el-date-picker
- v-model="dataForm.wantedDeliveryDate"
+ v-model="dataForm.deliveryDate"
style="width: 100%"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -132,7 +142,16 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12">
+ <el-form-item label="宸ヨ壓鏂囦欢鍚嶇О" prop="docName">
+ <el-input
+ v-model="dataForm.docName"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
<el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
<el-date-picker
v-model="dataForm.plannedDeliveryDate"
@@ -143,13 +162,37 @@
>
</el-date-picker>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
- <el-card
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="璁㈠崟澶囨敞" prop="comment">
+ <el-input
+ v-model="dataForm.comment"
+ placeholder=""
+ :disabled="!ediSource"
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="浜у搧澶囨敞" prop="remark">
+ <el-input
+ v-model="dataForm.remark"
+ placeholder=""
+ :disabled="!ediSource"
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- <el-card
header="璁㈠崟鍙傛暟"
shadow="never"
class="productorder-order-param"
- >
+ > -->
<el-row>
<el-form-item
style="float:left;width: 50%"
@@ -166,8 +209,33 @@
</el-row>
</el-card>
</el-tab-pane>
- <el-tab-pane label="闄勪欢" type="card">
+ <el-tab-pane label="闄勪欢" type="card" name="闄勪欢">
+ <div style="display: flex;justify-content:flex-end;">
+ <div></div>
+ </div>
+ <div
+ v-loading="progrecessFileLoading"
+ element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
+ >
<el-upload
+ drag
+ ref="upload"
+ action="/mes/plan/customerOrder/upload"
+ :auto-upload="true"
+ :headers="headers"
+ :before-upload="submitUpload"
+ :on-success="uploadSuccess"
+ :data="paramData"
+ :with-credentials="true"
+ :show-file-list="false"
+ >
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em>
+ </div>
+ </el-upload>
+ </div>
+ <!-- <el-upload
disabled
action=""
ref="upload"
@@ -176,10 +244,93 @@
:on-preview="handlePreview"
:with-credentials="true"
>
- </el-upload>
+ </el-upload> -->
+ <el-table :data="processConfigFileTableData" height="400px">
+ <el-table-column
+ prop="orderNumber"
+ align="center"
+ label="璁㈠崟鍙�"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <!-- <el-table-column prop="lineNumber" align="center" label="琛屽彿"> -->
+ <!-- </el-table-column> -->
+ <el-table-column
+ prop="originalFileName"
+ align="center"
+ label="鍘熸枃浠跺悕"
+ width="200"
+ >
+ </el-table-column>
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
+ </el-table-column>
+ <el-table-column prop="createUser" align="center" label="涓婁紶浜�">
+ </el-table-column>
+ <el-table-column
+ prop="createTime"
+ align="center"
+ label="涓婁紶鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column prop="updateUser" align="center" label="鏇存柊浜�">
+ </el-table-column>
+ <el-table-column
+ prop="updateTime"
+ align="center"
+ label="鏇存柊鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <!-- <el-table-column align="center" label="鏄惁鍚屾宸ヨ壓閰嶇疆鍗�">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <el-switch-->
+ <!-- :value="scope.row.effectiveRange"-->
+ <!-- active-value="1"-->
+ <!-- inactive-value="0"-->
+ <!-- @input="handleInput(scope.row)"-->
+ <!-- :disabled="scope.row.lineNumber !== dataForm.otcLineNo"-->
+ <!-- />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column fixed="right" align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <!-- <el-button
+ @click="synchronizeFile(scope.row)"
+ type="text"
+ size="small"
+ :disabled="scope.row.lineNumber !== dataForm.customerNo"
+ >鍚屾</el-button
+ > -->
+ <el-button
+ @click="delProcessConfigFile(scope.row)"
+ type="text"
+ size="small"
+ :disabled="scope.row.lineNumber !== dataForm.customerNo"
+ >鍒犻櫎</el-button
+ >
+ <el-button
+ @click="downloadProcessConfigFile(scope.row)"
+ type="text"
+ size="small"
+ >涓嬭浇</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
</el-tab-pane>
</el-tabs>
</el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="visible = false">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ :disabled="buttonDisable"
+ v-thinclick="`dataFormSubmit`"
+ v-if="editable"
+ >纭畾</el-button
+ >
+ </span>
</el-tab-pane>
</el-tabs>
</template>
@@ -196,11 +347,14 @@
addCustomerOrder,
download,
getCustomerOrder,
+ deleteProcessConfigFile,
+ downloadProcessConfigFile,
putCustomerOrder
} from '@/api/plan/customerorder'
import { remote } from '@/api/admin/dict'
import { validateSixDecimal } from '@/util/validate'
-import { getCustomer } from '../../../api/plan/manufacturingorder'
+import { getStore } from '@/util/store'
+import { getCustomer,getProcessConfigFile } from '../../../api/plan/manufacturingorder'
export default {
props: {
@@ -277,37 +431,71 @@
{ validator: validateSixDecimal, trigger: 'blur' }
]
},
+ paramData: {
+ // range: '1',
+ orderNumber: '',
+ lineNumber: ''
+ },
+ headers: {
+ Authorization: 'Bearer ' + getStore({ name: 'access_token' })
+ },
units: [],
coStates: [
+ // {
+ // value: '01plan',
+ // label: '寰呰鍒�'
+ // },
+ // {
+ // value: '03planed',
+ // label: '宸茶鍒�'
+ // },
+ // {
+ // value: '02planing',
+ // label: '璁″垝涓�'
+ // },
+ // {
+ // value: '04complete',
+ // label: '宸插畬鎴�'
+ // }
+ {
+ value: '01partUnCheck',
+ label: '闆朵欢寰呴��'
+ },
{
- value: '01plan',
+ value: '02technologyUnCheck',
+ label: '宸ヨ壓鏂囦欢寰呴��'
+ },
+ {
+ value: '03plan',
label: '寰呰鍒�'
},
{
- value: '03planed',
- label: '宸茶鍒�'
+ value: '04planed',
+ label: '宸蹭笅鍙�'
},
{
- value: '02planing',
- label: '璁″垝涓�'
+ value: '05cancel',
+ label: '宸蹭綔搴�'
},
{
- value: '04complete',
- label: '宸插畬鎴�'
+ value: '06unedit',
+ label: '璁㈠崟缂栬緫'
}
- ]
+ ],
+ processConfigFileTableData: [],
+ activeFileName: ""
}
},
computed: {
- editable: function() {
- if (!this.dataForm.id) {
- return true
- }
- if (this.dataForm.id && this.dataForm.coState !== '04complete') {
- return true
- }
- return false
- },
+ // editable: function() {
+ // if (!this.dataForm.id) {
+ // return true
+ // }
+ // if (this.dataForm.id && this.dataForm.coState !== '04complete') {
+ // return true
+ // }
+ // return false
+ // },
ediSource: function() {
if (!this.dataForm.id) {
return true
@@ -360,8 +548,8 @@
}
this.fileList = response.data.data.customerOrderAttachmentList
this.orderParamList = response.data.data.orderParamList
-
-
+ //闄勪欢
+ this.processConfigFileTableData = response.data.data.configFiles
this.title =
this.dataForm.customerName + this.dataForm.customerOrderNo
})
@@ -371,6 +559,47 @@
this.$refs.tabs.currentName = '0'
}
})
+ },
+ submitUpload() {
+ this.paramData.orderNumber = this.dataForm.contractNo
+ this.paramData.lineNumber = this.dataForm.customerNo
+ this.progrecessFileLoading = true
+ },
+ uploadSuccess() {
+ this.progrecessFileLoading = false
+ this.downs()
+ },
+ //闄勪欢鐨勬煡璇�
+ downs(label, e){
+ if(this.activeFileName=='闄勪欢'){
+ getProcessConfigFile({
+ orderNumber: this.dataForm.contractNo,
+ lineNumber: this.dataForm.customerNo
+ }).then((res)=>{
+ this.processConfigFileTableData = res.data.data
+ })
+ }
+ },
+ downloadProcessConfigFile(row) {
+ downloadProcessConfigFile(
+ row.fileName,
+ row.bucketName,
+ row.originalFileName
+ )
+ },
+ delProcessConfigFile(row) {
+ this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ closeOnClickModal: false
+ })
+ .then(function() {
+ return deleteProcessConfigFile(row.id)
+ })
+ .then((data) => {
+ this.downs()
+ })
},
// 闄勪欢鐨勭偣鍑�
handlePreview(file) {
@@ -425,6 +654,9 @@
},
handleTabClick(tab, event) {
this.init(parseInt(tab.name))
+ if(tab.name){
+
+ }
},
// 闆朵欢閫夋嫨
openPartDialog() {
--
Gitblit v1.9.3