diff --git a/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList1.vue b/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList1.vue new file mode 100644 index 00000000..06d5d1af --- /dev/null +++ b/ant-design-vue-jeecg/src/views/productrecord/ProductRecordList1.vue @@ -0,0 +1,238 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/sensorrecord/SensorRecordList1.vue b/ant-design-vue-jeecg/src/views/sensorrecord/SensorRecordList1.vue new file mode 100644 index 00000000..a110ab83 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/sensorrecord/SensorRecordList1.vue @@ -0,0 +1,202 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue index 7b9a8901..cce2bcd4 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue @@ -18,8 +18,19 @@ - + + + @@ -35,8 +46,19 @@ - + + + @@ -113,6 +135,9 @@ export default { data() { return { nums: '', + multi: false, + param:{enterprise_id:""}, + param2:{style_id:""}, selectedKey: '', // 款式id typeid: '', // 型号, serialNumber: '', // 顺序号 @@ -178,17 +203,28 @@ export default { console.log(this.props, 'superFieldList') }, methods: { + popupCallback(value,row){ + this.model = Object.assign(this.model, row); + this.param2.style_id = this.model.styleId; + }, + popupCallback2(value,row){ + this.model = Object.assign(this.model, row); + this.gaibian(); + }, add() { this.edit(this.modelDefault); }, // kuanshi(){ - this.dict="zy_cloths_style,style_names,id,enterprise_id="+"'"+this.model.enterpriseId+"'"; + this.param.enterprise_id = this.model.enterpriseId; + /*this.dict="zy_cloths_style,style_names,id,enterprise_id="+"'"+this.model.enterpriseId+"'";*/ // this.model.styleId=null // this.model.nums=null }, xiugai(){ - this.modenumber="zy_style_model,model_number,id,style_id="+"'"+this.model.styleId+"'" +/* this.modenumber="zy_style_model,model_number,id,style_id="+"'"+this.model.styleId+"'"*/ + this.param2.style_id = this.model.styleId; + // this.model.stylemodelId=null // this.model.nums=null // if(this.model.stylemodelId!=null&&this.model.enterpriseId!=null){ @@ -223,7 +259,7 @@ export default { }, edit(record) { this.model = Object.assign({}, record); - this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.enterpriseId+"'"; + this.dict="zy_cloths_style,style_names,id,enterprise_id="+"'"+this.model.enterpriseId+"'"; this.modenumber="zy_style_model,model_number,id,style_id="+"'"+this.model.styleId+"'" this.visible = true; } diff --git a/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue b/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue index 8391ce0e..ada55544 100644 --- a/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue +++ b/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue @@ -11,17 +11,49 @@ - + + + - + + + - + + + @@ -129,6 +161,8 @@ lx:'zy_cloths_type ,type_name,id', ks:'zy_cloths_style,style_names,id', xh:'zy_style_model,model_number,id', + param:{type_id:""}, + param2:{style_id:""}, autoplay:true, model:{ customized:0, @@ -144,6 +178,7 @@ sm: { span: 16 }, }, confirmLoading: false, + multi: false, validatorRules: { enterprisesId:[{ required: true, message: '请选择企业!' @@ -206,6 +241,41 @@ this.modelDefault = JSON.parse(JSON.stringify(this.model)); }, methods: { + popupCallback(value,row){ + this.model = Object.assign(this.model, row); + this.param.type_id = this.model.clothsTypeId; + }, + popupCallback2(value,row){ + this.model = Object.assign(this.model, row); + this.param2.style_id = this.model.styleId; + getAction(this.url.zystyle, {ksid:this.model.styleId}).then((res) => { + if (res.success) { + // this.$forceUpdate(); + this.$set(this.model,'goodsIntr',res.result.productOverview); + this.$set(this.model,'goodsPicture',res.result.designSketch); + this.$set(this.model,'defaultPicture',res.result.designSketch); + } else { + + } + }); + }, + popupCallback3(value,row){ + this.model = Object.assign(this.model, row); + // //如果编辑-商品编码不该改变 + if(!this.model.id) + { + getAction(this.url.zy, {lxid:this.model.clothsTypeId,xhid:this.model.modelId}).then((res) => { + if (res.success) { + // console.log(res.result.nums) + // this.$forceUpdate(); + //写一个接口返回一个拼装好的商品编号 + this.$set(this.model,'goodsCode',res.result); + } else { + + } + }); + } + }, getlx(){ this.lx ="zy_cloths_type ,type_name,id,enterprise_id='" + this.model.enterprisesId + "'"; }, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java index 102eaecf..73e5e3f6 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java @@ -163,4 +163,8 @@ public class ZyPlanProcess implements Serializable { @ApiModelProperty(value = "工位序号") private Integer stationNum; + + //未生产1、生产中2、已完成3、异常9，默认1 + @ApiModelProperty(value = "状态") + private Integer status; }