@@ -247,8 +194,7 @@ export default {
contractTitle:undefined,
contractType:undefined,
areaId:undefined,
- canteenId:undefined,
- dateRange:[],
+ canteenId:undefined,
},
// 表单校验
baseRules: {
@@ -264,12 +210,9 @@ export default {
supplierId: [
{ required: true, message: "供应商不能为空", trigger: "change" }
],
- contractSigningTime: [
+ purchaseDate: [
{ required: true, message: "签订日期不能为空", trigger: "change" }
- ],
- dateRange: [
- { required: true, message: "合同生效周期不能为空", trigger: "change" }
- ]
+ ],
},
treeAreaOptions:[],
canteenOptions:[],
@@ -279,8 +222,7 @@ export default {
disabledDate(v) {
return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天
}
- },
- attachmentList:[],
+ },
contractMaterialList:[],//货品信息-表格数据
batchIds:[],//货品信息-表格数据-多选
openDialog:false,
@@ -298,8 +240,7 @@ export default {
},
created() {
this.getAreaTreeData()
- this.getMaterialTree()
- this.attachmentList=[]
+ this.getMaterialTree()
if(this.$route.query.pageJson){
this.pageJson = JSON.parse(this.$route.query.pageJson)
this.getContractInfo()
@@ -319,18 +260,12 @@ export default {
}
//查询查询食堂下拉结构
getPurchaseContractInfoApi(param).then((response) => {
- this.baseInfo = response.data;
- this.$set(this.baseInfo,'dateRange',[this.baseInfo.contractStartTime,this.baseInfo.contractEndTime])
+ this.baseInfo = response.data;
this.contractMaterialList = this.baseInfo.purchaseContractDetailList;
this.contractMaterialList.forEach(item=>{
this.$set(item,"singlePrice",Number(item.singlePrice)/100)
- })
- if(this.baseInfo.contractAttachmentList.length>0){
- this.baseInfo.contractAttachmentList.forEach(item=>{
- this.attachmentList.push({name:item,url:item})
- })
- }
- this.$set(this.baseInfo,"contractAmount",Number(this.baseInfo.contractAmount)/100)
+ })
+ this.$set(this.baseInfo,"purchaseBudgetTotal",Number(this.baseInfo.purchaseBudgetTotal)/100)
getCanteenByAreaApi({areaId:this.baseInfo.areaId}).then((response) => {
this.canteenOptions=response.rows||[];
this.$set(this.baseInfo,"canteenId",this.baseInfo.canteenId)
@@ -467,21 +402,12 @@ export default {
confirmSave(){
this.$refs["baseInfo"].validate(valid => {
if (valid) {
- let param = Object.assign({},this.baseInfo);
- param.contractStartTime = this.formatDateTime(this.baseInfo.dateRange[0])
- param.contractEndTime = this.formatDateTime(this.baseInfo.dateRange[1])
- param.contractSigningTime = this.formatDate(this.baseInfo.contractSigningTime)
- param.payMoneyDate = this.formatDate(this.baseInfo.payMoneyDate)
- param.contractAmount = this.baseInfo.contractAmount*100;
+ let param = Object.assign({},this.baseInfo);
+ param.purchaseDate = this.formatDate(this.baseInfo.purchaseDate)
+ param.deliverGoodsDate = this.formatDate(this.baseInfo.deliverGoodsDate)
+ param.purchaseBudgetTotal = this.baseInfo.purchaseBudgetTotal*100;
param.commitStatus=1
- param.purchaseContractDetailList = []
- param.contractAttachment = ""
- if(this.attachmentList.length>0){
- console.log(this.attachmentList)
- let arr = this.attachmentList.map(item=>item.url)
- param.contractAttachment = arr.join(',')
- console.log(param)
- }
+ param.purchaseContractDetailList = []
this.noMaterial = false;
if(this.contractMaterialList.length>0){
this.contractMaterialList.forEach(item=>{
@@ -533,12 +459,10 @@ export default {
confirmSubmit(){
this.$refs["baseInfo"].validate(valid => {
if (valid) {
- let param = Object.assign({},this.baseInfo);
- param.contractStartTime = this.formatDateTime(this.baseInfo.dateRange[0])
- param.contractEndTime = this.formatDateTime(this.baseInfo.dateRange[1])
- param.contractSigningTime = this.formatDate(this.baseInfo.contractSigningTime)
- param.payMoneyDate = this.formatDate(this.baseInfo.payMoneyDate)
- param.contractAmount = this.baseInfo.contractAmount*100;
+ let param = Object.assign({},this.baseInfo);
+ param.purchaseDate = this.formatDate(this.baseInfo.purchaseDate)
+ param.deliverGoodsDate = this.formatDate(this.baseInfo.deliverGoodsDate)
+ param.purchaseBudgetTotal = this.baseInfo.purchaseBudgetTotal*100;
param.commitStatus=2
param.purchaseContractDetailList = []
this.noMaterial = false;
@@ -588,30 +512,7 @@ export default {
}
});
},
-
- //附件上传
- fileUpLoad(param){
- param.type = 'canteen'
- imgUpLoadTwo(param).then((res) => {
- if (res.code == 200) {
- this.attachmentList.push(res.data)
- } else {
- this.$modal.msgError(res.msg);
- }
- }).catch((error) => {
- this.$modal.msgError(error)
- })
- },
- handleRemoveFile(file, fileList){
- console.log(this.attachmentList)
- let sum = 0
- this.attachmentList.forEach((item, index) => {
- if (item.url == file.url) {
- sum = index
- }
- })
- this.attachmentList.splice(sum, 1)
- },
+
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD
diff --git a/src/views/foodManage/purchaseManage/purchasePlan/index.vue b/src/views/foodManage/purchaseManage/purchasePlan/index.vue
index 14ab69a4..99396c41 100644
--- a/src/views/foodManage/purchaseManage/purchasePlan/index.vue
+++ b/src/views/foodManage/purchaseManage/purchasePlan/index.vue
@@ -1,9 +1,6 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -67,57 +79,43 @@
{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}
-
-
-
-
-
+
+
+
+
+
+
- 待生效
- 履行中
- 已失效
- 已终止
+ 待发布
+ 已发布
-
-
- 待提交
- 已提交
-
-
-
+
+ -->
+
+
-
+
+
编辑
详情