测试问题修改8

src/api/foodManage/purchaseManage.js

@@ -89,3 +89,63 @@ export function delPurchaseContractApi(data) {
         }
     })
 }
+
+
+
+//获取采购计划分页列表
+export function purchasePlanPageApi(data) {
+  return request({
+    url: '/smart-canteen/ims_purchase_plan/list',
+    method: 'post',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    data:data,
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
+  })
+}
+//获取采购计划分页详情
+export function getPurchasePlanInfoApi(data) {
+  return request({
+    url: '/smart-canteen/ims_purchase_plan/'+data.planId,
+    method: 'get',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    }
+  })
+} 
+// 新增采购计划
+export function addPurchasePlanApi(data) {
+    return request({
+        url: '/smart-canteen/ims_purchase_plan',
+        method: 'post',
+        headers: {
+            //"merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+} 
+// 修改采购计划
+export function editPurchasePlanApi(data) {
+    return request({
+        url: '/smart-canteen/ims_purchase_plan/edit',
+        method: 'post',
+        headers: {
+            //"merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+}
+// 删除采购计划
+export function delPurchasePlanApi(data) {
+    return request({
+        url: '/smart-canteen/ims_purchase_plan/del/'+data.planIds,
+        method: 'post',
+        headers: {
+            //"merchant-id":"378915229716713472",
+        }
+    })
+}

src/views/canteen/accountCenter/account/consume/index.vue

@@ -78,6 +78,7 @@
             <span v-if="scope.row.tradeType==130">消费退款</span> -->
           </template>
         </el-table-column>
+        <el-table-column label="交易档口" align="center" prop="stallName" :show-overflow-tooltip="true"/>
         <el-table-column label="钱包类型" align="center" prop="walletType" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <span v-if="scope.row.walletType==1">个人钱包</span>

src/views/dashboard/PanelGroup.vue

@@ -11,7 +11,7 @@
         <div>
           <div style="display: flex;justify-content: space-between;width: 70%;" v-if="Number(item.rate)>=0">
             <div style="font-size: 14px;color: #07B78A;">
-              同比上次  +{{item.rate}}％
+              同比昨日  +{{item.rate}}％
             </div>
             <div>
               <img src="@/assets/images/up.png" style="width: 18px;height: 18px;">
@@ -19,7 +19,7 @@
           </div>
           <div style="display: flex;justify-content: space-between;width: 70%;" v-if="Number(item.rate)<0">
             <div style="font-size: 14px;color: #d81e06;">
-              同比上次  {{item.rate}}％
+              同比昨日  {{item.rate}}％
             </div>
             <div>
               <img src="@/assets/images/down.png" style="width: 18px;height: 18px;">

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

@@ -2,11 +2,27 @@
     <div style="padding: 10px;background: #E5EBF6;min-height: 830px;">
         <div style="background: #FFF;padding: 10px;border-radius: 10px;margin-bottom: 20px;">
             <el-form :model="baseInfo" ref="baseInfo" :rules="baseRules" size="medium" :inline="true" label-width="110px">
-                <el-form-item label="合同编号" prop="contractCode">
+                <el-form-item label="采购计划单号" prop="contractCode">
-                    <el-input v-model="baseInfo.contractCode" placeholder="合同编号自动生成" disabled maxlength="20" clearable style="width: 240px"/>
+                    <el-input v-model="baseInfo.contractCode" placeholder="采购计划单号自动生成" disabled maxlength="20" clearable style="width: 240px"/>
                 </el-form-item>
-                <el-form-item label="合同标题" prop="contractTitle">
+                <el-form-item label="采购时间" prop="purchaseDate">
-                    <el-input v-model="baseInfo.contractTitle" placeholder="请输入合同标题" maxlength="20" clearable style="width: 240px"/>
+                    <el-date-picker
+                        v-model="baseInfo.purchaseDate"
+                        type="date" align="right"  
+                        format="yyyy-MM-dd" style="width: 240px;"
+                        :picker-options="pickerOptions" @change="baseInfo.purchaseDate=formatDate(baseInfo.purchaseDate)">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="交货日期" prop="deliverGoodsDate">
+                    <el-date-picker
+                            v-model="baseInfo.deliverGoodsDate"
+                            type="date" align="right"  
+                            format="yyyy-MM-dd" style="width: 240px;"
+                            :picker-options="pickerOptions" @change="baseInfo.deliverGoodsDate=formatDate(baseInfo.deliverGoodsDate)">
+                        </el-date-picker>
+                </el-form-item>
+                <el-form-item label="采购预算" prop="purchaseBudgetTotal">
+                    <el-input v-model="baseInfo.purchaseBudgetTotal" placeholder="请输入合同总金额" maxlength="20" clearable style="width: 240px" @input="(v)=>(baseInfo.purchaseBudgetTotal=v.replace(/[^\d.]/g,''))"/>
                 </el-form-item>  
                 <el-form-item label="所属区域" prop="areaId">
                     <el-cascader v-model="baseInfo.areaId"
@@ -18,15 +34,6 @@
                         }" @change="handleAreaChange">
                     </el-cascader>
                 </el-form-item>
-                <el-form-item label="所属食堂" prop="canteenId">
-                    <el-select v-model="baseInfo.canteenId" placeholder="请选择所属食堂" style="width: 240px;">
-                        <el-option v-for="item in canteenOptions"
-                            :key="item.canteenId"
-                            :label="item.canteenName"
-                            :value="item.canteenId"
-                        ></el-option>
-                    </el-select> 
-                </el-form-item>
                 <el-form-item label="供应商" prop="supplierId">
                     <el-select v-model="baseInfo.supplierId" placeholder="请选择供应商" style="width: 240px;">
                         <el-option v-for="item in supplierOptions"
@@ -36,78 +43,18 @@
                         ></el-option>
                     </el-select> 
                 </el-form-item>
-                <el-form-item label="签订日期" prop="contractSigningTime">
+                <el-form-item label="所属食堂" prop="canteenId">
-                    <el-date-picker
+                    <el-select v-model="baseInfo.canteenId" placeholder="请选择所属食堂" style="width: 240px;">
-                        v-model="baseInfo.contractSigningTime"
+                        <el-option v-for="item in canteenOptions"
-                        type="date" align="right"  
+                            :key="item.canteenId"
-                        format="yyyy-MM-dd" style="width: 240px;"
+                            :label="item.canteenName"
-                        :picker-options="pickerOptions" @change="baseInfo.contractSigningTime=formatDate(baseInfo.contractSigningTime)">
+                            :value="item.canteenId"
-                    </el-date-picker>
+                        ></el-option>
-                </el-form-item> 
+                    </el-select> 
-                <el-form-item label="合同生效周期" prop="dateRange">
-                    <el-date-picker
-                        v-model="baseInfo.dateRange"
-                        type="datetimerange"
-                        align="right"
-                        unlink-panels
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        format="yyyy-MM-dd HH:mm:ss" style="width: 400px"
-                        :default-time="['00:00:00', '23:59:59']"
-                        :picker-options="pickerOptions" >
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="付款方式" prop="payMoneyStyle">
-                    <el-radio-group v-model="baseInfo.payMoneyStyle" >
-                        <el-radio label="1" style="font-size: 14px;">一次性付款</el-radio>
-                        <el-radio label="2" style="font-size: 14px;">分期付款</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="付款日期" prop="payMoneyDate">
-                    <el-date-picker
-                            v-model="baseInfo.payMoneyDate"
-                            type="date" align="right"  
-                            format="yyyy-MM-dd" style="width: 240px;"
-                            :picker-options="pickerOptions" @change="baseInfo.payMoneyDate=formatDate(baseInfo.payMoneyDate)">
-                        </el-date-picker>
-                </el-form-item>
-                <el-form-item label="收款银行" prop="collectMoneyBank">
-                    <el-input v-model="baseInfo.collectMoneyBank" placeholder="请输入收款银行" maxlength="20" clearable style="width: 240px"/>
-                </el-form-item>
-                <el-form-item label="收款账户名称" prop="collectMoneyAccountName">
-                    <el-input v-model="baseInfo.collectMoneyAccountName" placeholder="请输入收款账户名称" maxlength="20" clearable style="width: 240px"/>
-                </el-form-item>
-                <el-form-item label="收款账号" prop="collectMoneyAccount">
-                    <el-input v-model="baseInfo.collectMoneyAccount" placeholder="请输入收款账号" maxlength="20" clearable style="width: 240px"/>
                 </el-form-item> 
                 <el-form-item label="备注" prop="remark">
                     <el-input v-model="baseInfo.remark" placeholder="请输入备注" maxlength="30" clearable style="width: 240px"/>
                 </el-form-item>  
-                <el-form-item label="负责人" prop="contractPerson">
-                    <el-input v-model="baseInfo.contractPerson" placeholder="请输入负责人" maxlength="20" clearable style="width: 240px"/>
-                </el-form-item>
-                <el-form-item label="合同总金额" prop="contractAmount">
-                    <el-input v-model="baseInfo.contractAmount" placeholder="请输入合同总金额" maxlength="20" clearable style="width: 240px" @input="(v)=>(baseInfo.contractAmount=v.replace(/[^\d.]/g,''))"/>
-                </el-form-item> 
-                <el-form-item label="合同附件" prop="contractAttachmentList">
-                    <el-upload
-                        ref="upload"
-                        :http-request="fileUpLoad"
-                        action="#" :limit="5"
-                        accept=".xlsx, .xls, .png, .jpg, .jpeg, .docx, .doc" 
-                        :show-file-list="true" 
-                        :file-list="attachmentList"
-                        :on-remove="handleRemoveFile"
-                    >
-                        <el-button
-                            :disabled="attachmentList.length==5"
-                            type="primary"
-                            size="mini"  
-                            >上传附件
-                        </el-button>
-                    </el-upload>
-                </el-form-item> 
             </el-form>
         </div> 
         <div style="width: 100%;height: 450px;padding: 10px;border-radius: 10px;margin-bottom: 10px;background: #FFF;">
@@ -248,7 +195,6 @@ export default {
             contractType:undefined,
             areaId:undefined,
             canteenId:undefined,  
-            dateRange:[], 
         },
         // 表单校验
         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:[],
@@ -280,7 +223,6 @@ export default {
                 return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
             }
         }, 
-        attachmentList:[],
         contractMaterialList:[],//货品信息-表格数据
         batchIds:[],//货品信息-表格数据-多选
         openDialog:false,
@@ -299,7 +241,6 @@ export default {
     created() {
         this.getAreaTreeData()  
         this.getMaterialTree()   
-        this.attachmentList=[]
         if(this.$route.query.pageJson){ 
             this.pageJson = JSON.parse(this.$route.query.pageJson)
             this.getContractInfo()
@@ -320,17 +261,11 @@ export default {
             //查询查询食堂下拉结构
             getPurchaseContractInfoApi(param).then((response) => {
                 this.baseInfo = response.data; 
-                this.$set(this.baseInfo,'dateRange',[this.baseInfo.contractStartTime,this.baseInfo.contractEndTime]) 
                 this.contractMaterialList = this.baseInfo.purchaseContractDetailList; 
                 this.contractMaterialList.forEach(item=>{
                     this.$set(item,"singlePrice",Number(item.singlePrice)/100) 
                 }) 
-                if(this.baseInfo.contractAttachmentList.length>0){
+                this.$set(this.baseInfo,"purchaseBudgetTotal",Number(this.baseInfo.purchaseBudgetTotal)/100)
-                    this.baseInfo.contractAttachmentList.forEach(item=>{
-                        this.attachmentList.push({name:item,url:item})
-                    })
-                } 
-                this.$set(this.baseInfo,"contractAmount",Number(this.baseInfo.contractAmount)/100)
                 getCanteenByAreaApi({areaId:this.baseInfo.areaId}).then((response) => {
                     this.canteenOptions=response.rows||[];
                     this.$set(this.baseInfo,"canteenId",this.baseInfo.canteenId)
@@ -468,20 +403,11 @@ export default {
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) { 
                     let param = Object.assign({},this.baseInfo); 
-                    param.contractStartTime = this.formatDateTime(this.baseInfo.dateRange[0])
+                    param.purchaseDate = this.formatDate(this.baseInfo.purchaseDate)
-                    param.contractEndTime = this.formatDateTime(this.baseInfo.dateRange[1])
+                    param.deliverGoodsDate = this.formatDate(this.baseInfo.deliverGoodsDate)  
-                    param.contractSigningTime = this.formatDate(this.baseInfo.contractSigningTime)
+                    param.purchaseBudgetTotal = this.baseInfo.purchaseBudgetTotal*100;
-                    param.payMoneyDate = this.formatDate(this.baseInfo.payMoneyDate)  
-                    param.contractAmount = this.baseInfo.contractAmount*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) 
-                    }
                     this.noMaterial = false;
                     if(this.contractMaterialList.length>0){ 
                         this.contractMaterialList.forEach(item=>{
@@ -534,11 +460,9 @@ export default {
             this.$refs["baseInfo"].validate(valid => {
                 if (valid) { 
                     let param = Object.assign({},this.baseInfo); 
-                    param.contractStartTime = this.formatDateTime(this.baseInfo.dateRange[0])
+                    param.purchaseDate = this.formatDate(this.baseInfo.purchaseDate)
-                    param.contractEndTime = this.formatDateTime(this.baseInfo.dateRange[1])
+                    param.deliverGoodsDate = this.formatDate(this.baseInfo.deliverGoodsDate)  
-                    param.contractSigningTime = this.formatDate(this.baseInfo.contractSigningTime)
+                    param.purchaseBudgetTotal = this.baseInfo.purchaseBudgetTotal*100;
-                    param.payMoneyDate = this.formatDate(this.baseInfo.payMoneyDate)  
-                    param.contractAmount = this.baseInfo.contractAmount*100;
                     param.commitStatus=2
                     param.purchaseContractDetailList = [] 
                     this.noMaterial = false;
@@ -589,29 +513,6 @@ 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

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

@@ -1,9 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> 
-        <el-form-item label="关键字" prop="searchValue">
-            <el-input v-model="queryParams.searchValue" placeholder="请输入用户姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
-        </el-form-item>
         <el-form-item label="计划日期">
             <el-date-picker
                 v-model="dateRange"
@@ -17,31 +14,46 @@
                 :default-time="['00:00:00', '23:59:59']"
                 :picker-options="pickerOptions" >
             </el-date-picker>
+        </el-form-item>
+         <el-form-item label="采购单号" prop="planCode">
+            <el-input v-model="queryParams.planCode" placeholder="请输入采购单号" maxlength="20" clearable style="width: 240px"/>
+        </el-form-item>
+         <el-form-item label="计划状态" prop="status"> 
+            <el-select v-model="queryParams.status" placeholder="请选择计划状态" style="width: 240px;">
+                <el-option label="待发布" :value="1"></el-option>
+                <el-option label="已发布" :value="2"></el-option> 
+            </el-select> 
         </el-form-item>   
         <el-form-item label="所属区域" prop="areaId">
-          <el-cascader v-model="queryParams.areaId"
+            <el-cascader v-model="queryParams.areaId"
-            :options="treeOptions" :filterable="true" style="width: 100%;" :show-all-levels="false"
+            :options="treeAreaOptions" :filterable="true" style="width: 100%;" :show-all-levels="false"
             :props="{  
-              emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
+                emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
-              checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
+                checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
-              value:'id',label:'label'
+                value:'id',label:'label'
-            }" clearable>
+            }" clearable @change="handleAreaChange">
-          </el-cascader>
+            </el-cascader>
         </el-form-item>
-        <el-form-item label="提交状态" prop="commitStatus"> 
+        <el-form-item label="所属食堂" prop="canteenId">
-            <el-select v-model="queryParams.commitStatus" placeholder="请选择提交状态" style="width: 240px;">
+            <el-select v-model="queryParams.canteenId" placeholder="请选择所属食堂" style="width: 100%;" @change="handleCanteenChange">
-                <el-option label="待提交" :value="1"></el-option>
+                <el-option v-for="item in canteenOptions"
-                <el-option label="已提交" :value="2"></el-option> 
+                    :key="item.canteenId"
+                    :label="item.canteenName"
+                    :value="item.canteenId"
+                ></el-option>
             </el-select> 
         </el-form-item>
-        <el-form-item label="合同状态" prop="contractStatus"> 
+        <el-form-item label="所属档口" prop="stallId">
-            <el-select v-model="queryParams.contractStatus" placeholder="请选择合同状态" style="width: 240px;">
+            <el-select v-model="queryParams.stallId" placeholder="请选择所属档口" style="width: 100%;" >
-                <el-option label="待生效" :value="1"></el-option>
+                <el-option v-for="item in stallOptions"
-                <el-option label="履行中" :value="2"></el-option> 
+                    :key="item.stallId"
-                <el-option label="已失效" :value="3"></el-option> 
+                    :label="item.stallName"
-                <el-option label="已终止" :value="4"></el-option> 
+                    :value="item.stallId"
+                ></el-option>
             </el-select> 
         </el-form-item> 
+       
+      
         <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -67,57 +79,43 @@
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="采购单号" align="center" prop="contractCode" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="合同标题" align="center" prop="contractTitle" :show-overflow-tooltip="true" width="120" />
+        <el-table-column label="采购计划时间" align="center" prop="contractTitle" :show-overflow-tooltip="true" width="120" />
-        <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="所属区域(食堂/档口)" align="center" prop="areaName" :show-overflow-tooltip="true" width="180"/>
-        <el-table-column label="签订日期" align="center" prop="contractSigningTime" :show-overflow-tooltip="true"/>
+        <el-table-column label="计划采购货品总数量" align="center" prop="" :show-overflow-tooltip="true" width="150"/>
-        <el-table-column label="合同状态" align="center" prop="contractStatus" :show-overflow-tooltip="true" width="100">
+        <el-table-column label="采购预算金额（元）" align="center" prop="" :show-overflow-tooltip="true" width="140"/> 
+        <el-table-column label="计划状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
-                <span v-if="scope.row.contractStatus==1">待生效</span>
+                <span v-if="scope.row.status==1">待发布</span>
-                <span v-if="scope.row.contractStatus==2">履行中</span>
+                <span v-if="scope.row.status==2">已发布</span> 
-                <span v-if="scope.row.contractStatus==3">已失效</span>
-                <span v-if="scope.row.contractStatus==4">已终止</span>
             </template>  
         </el-table-column>
-        <el-table-column label="提交状态" align="center" prop="commitStatus" :show-overflow-tooltip="true" width="100">
+        <!-- <el-table-column label="合同总金额(元)" align="center" prop="contractAmount" :show-overflow-tooltip="true" width="120">
-            <template slot-scope="scope">
-                <span v-if="scope.row.commitStatus==1">待提交</span>
-                <span v-if="scope.row.commitStatus==2">已提交</span> 
-            </template>  
-        </el-table-column>
-        <el-table-column label="合同总金额(元)" align="center" prop="contractAmount" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
                <span>{{ (scope.row.contractAmount/100).toFixed(2) }}</span>
             </template>  
-        </el-table-column>
+        </el-table-column> --> 
-        <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="审批人" align="center" prop="approveBy" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="配送食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="审批完成时间" align="center" prop="approveTime" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="合同周期" align="center" prop="" :show-overflow-tooltip="true">
-             <template slot-scope="scope">
-               <span>{{ scope.row.contractStartTime }} - {{ scope.row.contractEndTime }}</span>
-            </template>   
-        </el-table-column>
-        <!-- <el-table-column label="审批人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="审批完成时间" align="center" prop="" :show-overflow-tooltip="true" width="120"/> -->
         <el-table-column label="负责人" align="center" prop="contractPerson" :show-overflow-tooltip="true" width="120"/>
-        <!-- <el-table-column label="制表人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="制表人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="制表时间" align="center" prop="" :show-overflow-tooltip="true" width="120"/> -->
+        <el-table-column label="制表时间" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
             <template slot-scope="scope"> 
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit" v-if="scope.row.commitStatus==1"
+                icon="el-icon-edit" v-if="scope.row.status==1"
                 @click="handleUpdate(scope.row)" 
             >编辑</el-button>
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit" v-if="scope.row.commitStatus==2"
+                icon="el-icon-edit" v-if="scope.row.status==2"
                 @click="handleView(scope.row)" 
             >详情</el-button>
             <!-- <el-button
-                size="mini" v-if="scope.row.commitStatus==1"
+                size="mini" v-if="scope.row.status==1"
                 type="text" :disabled="loadingBtn"
                 icon="el-icon-top" 
                 @click="confirmSubmit(scope.row)" 
@@ -158,8 +156,9 @@
 </template>
 
 <script>
-import { systemAreaTreeApi,getCanteenByAreaApi } from "@/api/base/stall"; 
+import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall"; 
-import { purchaseContractPageApi,getPurchaseContractInfoApi,addPurchaseContractApi,editPurchaseContractApi,delPurchaseContractApi } from "@/api/foodManage/purchaseManage";
+import { purchaseContractPageApi,editPurchaseContractApi,delPurchaseContractApi } from "@/api/foodManage/purchaseManage";
+import { purchasePlanPageApi, getPurchasePlanInfoApi, addPurchasePlanApi, editPurchasePlanApi, delPurchasePlanApi } from "@/api/foodManage/purchaseManage";
 
 export default {
     name: "",
@@ -189,8 +188,15 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10, 
+                planCode: '',  
+                status: null,  
+                areaId: null,  
+                canteenId: null,  
+                stallId: null
             }, 
-            treeOptions:[],//区域树
+            treeAreaOptions:[],//区域树
+            canteenOptions:[],//食堂下拉选
+            stallOptions:[],//档口下拉选
             dateRange:[],//区域树
             pickerOptions: {
                 shortcuts: [{
@@ -233,14 +239,34 @@ export default {
         };
     },
     created() { 
-      this.getTreeData();
+      this.getAreaTreeData();
       this.getList();
     },
     methods: {
-        //区域树
+         //区域树
-        getTreeData() {
+        getAreaTreeData() {
             systemAreaTreeApi({}).then((response) => {
-                this.treeOptions = response.data; 
+            this.treeAreaOptions = response.data; 
+            });
+        },
+        handleAreaChange(e){
+            let param= {
+            areaId:e,canteenType: 1
+            }
+            getCanteenByAreaApi(param).then((response) => {
+                this.canteenOptions=response.rows||[]
+                this.$set(this.queryParams,"canteenId",null) 
+                this.stallOptions = [] 
+                this.$set(this.queryParams,"stallId",null) 
+            });
+        },
+        handleCanteenChange(e){ 
+            let param= {
+            canteenId:e
+            }
+            getStallByCanteenApi(param).then((response) => {
+                this.stallOptions=response.rows||[]
+                this.$set(this.queryParams,"stallId",null) 
             });
         },
         /** 搜索按钮操作 */
@@ -260,10 +286,11 @@ export default {
             let param = {
                 "pageNum": this.queryParams.pageNum, 
                 "pageSize": this.queryParams.pageSize,  
-                "searchValue": this.queryParams.searchValue,     
+                "planCode": this.queryParams.planCode,     
+                "status": this.queryParams.status,   
                 "areaId": this.queryParams.areaId,  
-                "commitStatus": this.queryParams.commitStatus,  
+                "canteenId": this.queryParams.canteenId,  
-                "contractStatus": this.queryParams.contractStatus
+                "stallId": this.queryParams.stallId,   
             }
             if(this.dateRange.length>0){
                 param.startDateTime = this.formatDate(this.dateRange[0])
@@ -272,7 +299,7 @@ export default {
                 param.startDateTime = ""
                 param.endDateTime = ""
             }
-            purchaseContractPageApi(param).then(response => {
+            purchasePlanPageApi(param).then(response => {
                 this.tableListData = response.rows;
                 this.total = Number(response.total);
                 this.loading = false;

src/views/index_v1.vue

@@ -398,7 +398,7 @@ export default {
       var getValue = [];
       var chartData=[]
       getThisMonthSDishSalesRankingApi().then((response) => {
-          chartData = response.data;
+          chartData = response.data.slice(0, 10);
           chartData.forEach((item,index)=>{
             getName.push(item.name)
             getValue.push(item.num) 

src/views/kitchen/staffManage/staff/index.vue

@@ -492,8 +492,11 @@ export default {
             queryParams: {
             pageNum: 1,
             pageSize: 10, 
-            canteenName: undefined,
+            searchValue: undefined,
-            areaNameStr: undefined, 
+            sex: undefined, 
+            postName: undefined, 
+            faceState: undefined, 
+            healthCertStatus: undefined, 
             },
             // 表单参数
             form: {},
@@ -620,6 +623,15 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() { 
+            this.queryParams = {
+            pageNum: 1,
+            pageSize: 10, 
+            searchValue: undefined,
+            sex: undefined, 
+            postName: undefined, 
+            faceState: undefined, 
+            healthCertStatus: undefined, 
+            }
             this.resetForm("queryForm");
             this.handleQuery();
         },

src/views/system/notice/index.vue

@@ -112,7 +112,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            @click="handleDelete(scope.row,scope.$index)"
             v-hasPermi="['system:notice:remove']"
           >删除</el-button>
         </template>
@@ -303,9 +303,10 @@ export default {
       });
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
+    handleDelete(row,index) {
+      console.log(index)
       const noticeIds = row.noticeId || this.ids
-      this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除公告序号为"' + (index+1) + '"的数据项？').then(function() {
         return delNotice(noticeIds);
       }).then(() => {
         this.getList();