测试问题修改

src/api/foodManage/purchaseManage.js

@@ -124,6 +124,16 @@ export function delPurchaseContractApi(data) {
         }
     })
 }
+// 终止
+export function nullifyPurchaseContractApi(data) {
+    return request({
+        url: '/smart-canteen/ims_purchase_contract/nullify/'+data.contractIds,
+        method: 'post',
+        headers: {
+            //"merchant-id":"378915229716713472",
+        }
+    })
+}
 
 // -------------采购询价---------------
 //获取采购询价分页列表
@@ -319,7 +329,7 @@ export function purchasePlanPageApi(data) {
     headers: {
         //"merchant-id":"378915229716713472",
     },
-    data
+    params:data
   })
 }
 //获取采购计划分页详情

src/views/canteen/dish/material/components/MaterialDialog.vue

@@ -301,6 +301,7 @@ export default {
         materialName: [{ required: true, message: '请输入原料名称', trigger: 'blur' }],
         areaId: [{ required: true, message: '请选择所属区域', trigger: 'change' }],
         materialTypeId: [{ required: true, message: '请选择原料类别', trigger: 'change' }],
+        unitId: [{ required: true, message: '请选择单位', trigger: 'change' }],
         salesMode: [{ required: true, message: '请选择计量类型', trigger: 'change' }],
         shelfLifeDays: [{ required: true, message: '请输入临期天数', trigger: 'change' }],
         nutritionTypeId: [{ required: true, message: '请选择营养信息类别', trigger: 'change' }],

src/views/foodManage/pickManage/materialPicking/edit.vue

@@ -685,11 +685,11 @@ export default {
                 "stallId": this.baseInfo.stallId
             }
             if(this.dateRange&&this.dateRange.length>0){
-                param.startDateTime=this.formatDateTime(this.dateRange[0])
+                param.startTime=this.formatDateTime(this.dateRange[0])
-                param.endDateTime=this.formatDateTime(this.dateRange[1])
+                param.endTime=this.formatDateTime(this.dateRange[1])
             }else{
-                param.startDateTime=undefined;
+                param.startTime=undefined;
-                param.endDateTime=undefined;
+                param.endTime=undefined;
             }  
             purchasePlanPageApi(param).then(response => {
                 this.tableListData2 = response.rows;

src/views/foodManage/purchaseManage/contractList/index.vue

@@ -125,10 +125,16 @@
             >提交</el-button> -->
             <el-button
                 size="mini"
-                type="text"
+                type="text" style="color: red;"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)" 
             >删除</el-button>
+              <el-button
+                size="mini"
+                type="text" style="color: red;"
+                icon="el-icon-edit" v-if="scope.row.commitStatus==2&&scope.row.contractStatus==2"
+                @click="handleNullify(scope.row)" 
+            >终止</el-button>
             </template>
         </el-table-column>
     </el-table>
@@ -160,7 +166,7 @@
 
 <script>
 import { systemAreaTreeApi,getCanteenByAreaApi } from "@/api/base/stall"; 
-import { purchaseContractPageApi,getPurchaseContractInfoApi,addPurchaseContractApi,editPurchaseContractApi,delPurchaseContractApi } from "@/api/foodManage/purchaseManage";
+import { purchaseContractPageApi,getPurchaseContractInfoApi,addPurchaseContractApi,editPurchaseContractApi,delPurchaseContractApi,nullifyPurchaseContractApi } from "@/api/foodManage/purchaseManage";
 
 export default {
     name: "",
@@ -333,6 +339,15 @@ export default {
                 this.getList();
                 this.$modal.msgSuccess("删除成功");
             }).catch(() => {});
+        },
+         /** 终止按钮操作 */
+        handleNullify(row) { 
+            this.$modal.confirm('是否确认终止数据项？').then(function() {
+                return nullifyPurchaseContractApi({contractIds:[row.contractId]});
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("终止成功");
+            }).catch(() => {});
         }, 
         // 提交按钮 
         confirmSubmit(row){ 

src/views/foodManage/purchaseManage/goodsInquiry/edit.vue

@@ -752,11 +752,11 @@ export default {
                 "areaId": this.baseInfo.areaId,
             }
             if(this.dateRange&&this.dateRange.length>0){
-                param.startDateTime=this.formatDateTime(this.dateRange[0])
+                param.startTime=this.formatDateTime(this.dateRange[0])
-                param.endDateTime=this.formatDateTime(this.dateRange[1])
+                param.endTime=this.formatDateTime(this.dateRange[1])
             }else{
-                param.startDateTime=undefined;
+                param.startTime=undefined;
-                param.endDateTime=undefined;
+                param.endTime=undefined;
             }  
             purchasePlanPageApi(param).then(response => {
                 this.tableListData2 = response.rows;

src/views/foodManage/purchaseManage/purchaseOrder/edit.vue

@@ -821,11 +821,11 @@ export default {
                 "stallId": this.baseInfo.stallId
             }
             if(this.dateRange&&this.dateRange.length>0){
-                param.startDateTime=this.formatDateTime(this.dateRange[0])
+                param.startTime=this.formatDateTime(this.dateRange[0])
-                param.endDateTime=this.formatDateTime(this.dateRange[1])
+                param.endTime=this.formatDateTime(this.dateRange[1])
             }else{
-                param.startDateTime=undefined;
+                param.startTime=undefined;
-                param.endDateTime=undefined;
+                param.endTime=undefined;
             }  
             purchasePlanPageApi(param).then(response => {
                 this.tableListData2 = response.rows;

src/views/foodManage/purchaseManage/purchasePlan/index.vue

@@ -322,11 +322,11 @@ export default {
                 "stallId": this.queryParams.stallId,   
             }
              if(this.dateRange&&this.dateRange.length>0){
-                param.startDateTime=this.formatDateTime(this.dateRange[0])
+                param.startTime=this.formatDateTime(this.dateRange[0])
-                param.endDateTime=this.formatDateTime(this.dateRange[1])
+                param.endTime=this.formatDateTime(this.dateRange[1])
             }else{
-                param.startDateTime=undefined;
+                param.startTime=undefined;
-                param.endDateTime=undefined;
+                param.endTime=undefined;
             }  
             purchasePlanPageApi(param).then(response => {
                 this.tableListData = response.rows;

src/views/foodManage/stockManage/warehouseIn/edit.vue

@@ -685,6 +685,7 @@ export default {
                 "pageNum": this.queryParams2.pageNum,
                 "orderGoodsCode": this.queryParams2.orderGoodsCode,
                 "orderStatus":2,
+                "isInspect":0, 
                 "ifAllInto":2, 
                 "areaId": this.baseInfo.areaId,
                 "warehouseId": this.baseInfo.warehouseId, 

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
                 // target: `http://192.168.2.75:48380`,//旭
-                target: `http://192.168.0.244:48380`,//测试
+                target: `http://192.168.0.34:48380`,//测试
                 // target: `http://192.168.2.108:48380`,//测试
                 // target: `http://192.168.0.34:48380`,//测试
                 // target: `http://192.168.0.176:48380`,//