mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作台条码

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2023-03-05 14:25:58 +08:00
parent ba1c82448a
commit 53aae96352
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/mes/pro/feedback/index.vue
View File

@ -284,7 +284,9 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button> <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button type="success" @click="handleExecute" v-if="form.status =='PREPARE' && optType !='view' && form.recordId !=null">审 批</el-button> <el-button type="primary" @click="handleSubmit" v-if="form.status =='PREPARE' && optType !='view' ">提交审批</el-button>
<el-button type="success" @click="handleExecute" v-if="form.status =='APPROVING' && form.recordId !=null">审批通过</el-button>
<el-button type="danger" @click="handleReject" v-if="form.status =='APPROVING' && form.recordId !=null">审批不通过</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -510,13 +512,13 @@ export default {
} }
}); });
}, },
handleFinish(){ handleSubmit(){
this.form.status = "FINISHED"; this.form.status = "APPROVING";
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.recordId != null) { if (this.form.recordId != null) {
updateFeedback(this.form).then(response => { updateFeedback(this.form).then(response => {
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("提交成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });

32
src/views/mes/wm/barcode/index.vue
View File

@ -224,6 +224,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-else-if="form.barcodeType=='WORKSTATION'">
<el-col :span="12">
<el-form-item label="工作站" prop="bussinessCode">
<el-input v-model="form.bussinessCode" placeholder="请选择工作站" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input>
</el-form-item>
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
</el-col>
<el-col :span="12">
<el-form-item label="工作站名称" prop="bussinessName">
<el-input v-model="form.bussinessName" readonly="readonly" >
</el-input>
</el-form-item>
</el-col>
</el-row>
<!--根据不同的条码类型展示不同的业务内容选择 end--> <!--根据不同的条码类型展示不同的业务内容选择 end-->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -265,12 +281,13 @@ import { listBarcode, getBarcode, delBarcode, addBarcode, updateBarcode } from "
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue"; import VendorSelect from "@/components/vendorSelect/single.vue";
import PackageSelectSingle from "@/components/package/single.vue"; import PackageSelectSingle from "@/components/package/single.vue";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import Barcodeconfig from "./config.vue" import Barcodeconfig from "./config.vue"
export default { export default {
name: "Barcode", name: "Barcode",
dicts: ['mes_barcode_type','mes_barcode_formart','sys_yes_no'], dicts: ['mes_barcode_type','mes_barcode_formart','sys_yes_no'],
components: { components: {
ItemSelect,VendorSelect,PackageSelectSingle,Barcodeconfig ItemSelect,VendorSelect,PackageSelectSingle,Barcodeconfig,WorkstationSelect
}, },
data() { data() {
return { return {
@ -470,6 +487,19 @@ export default {
this.form.barcodeContent= "".concat(this.form.barcodeType,'-',this.form.bussinessCode); this.form.barcodeContent= "".concat(this.form.barcodeType,'-',this.form.bussinessCode);
} }
}, },
/**选择工作站 */
handleWorkstationSelect(){
this.$refs.wsSelect.showFlag = true;
},
/**工作站选择返回 */
onWorkstationSelected(obj){
if(obj != undefined && obj != null){
this.form.bussinessId = obj.workstationId;
this.form.bussinessCode = obj.workstationCode;
this.form.bussinessName = obj.workstationName;
this.form.barcodeContent= "".concat(this.form.barcodeType,'-',this.form.bussinessCode);
}
},
handleConfig(){ handleConfig(){
this.$refs.barcodeconfig.showFlag = true; this.$refs.barcodeconfig.showFlag = true;
} }