jsk 报价

src/api/foodManage/purchaseManage.js

@@ -162,6 +162,28 @@ export function editGoodsInquiryApi(data) {
         data: data
     })
 }
+// 修改采购报价
+export function editGoodsQuotationApi(data) {
+    return request({
+        url: '/smart-canteen/ims_quote/edit',
+        method: 'post',
+        headers: {
+            //"merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+}
+export function getGoodsInquiryDetailInfoApi(data) {
+    return request({
+        url: '/smart-canteen/ims_quote/detail',
+        method: 'post',
+        headers: {
+            //"merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+}
+
 // 删除采购询价
 export function delGoodsInquiryApi(data) {
     return request({

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

@@ -12,10 +12,10 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">询价状态</template>
-                    <span v-if="baseInfo.inquiryState==1">未开始</span>
+                    <span v-if="baseInfo.status==1">未开始</span>
-                    <span v-if="baseInfo.inquiryState==2">进行中</span>
+                    <span v-if="baseInfo.status==2">进行中</span>
-                    <span v-if="baseInfo.inquiryState==3">已结束</span>
+                    <span v-if="baseInfo.status==3">已结束</span>
-                    <span v-if="baseInfo.inquiryState==4">已取消</span>
+                    <span v-if="baseInfo.status==5">已取消</span>
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">报价时间</template>
@@ -39,15 +39,15 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">所属区域</template>
-                    {{ baseInfo.areaName }}
+                    {{ baseInfo.area }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">询价供应商</template>
-                    
+                      {{ baseInfo.supplierNames }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">备注</template>
-                    {{ baseInfo.remark }}
+                    {{ baseInfo.inquiryNotes }}
                 </el-descriptions-item>
             </el-descriptions>
         </div>
@@ -59,7 +59,7 @@
                 </div>
             </div>
             <div style="width: 100%;height: 400px;overflow-y: auto;">
-                <el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+                <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
                     <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
                     <el-table-column label="序号" align="center" width="80" type="index" />
                     <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" />  -->
@@ -110,6 +110,7 @@ export default {
             contractType:undefined,
             areaId:undefined,
             canteenId:undefined,
+            materialList:[],
             dateRange:[],
         },
         // 表单校验
@@ -191,6 +192,7 @@ export default {
             //查询
             getGoodsInquiryInfoApi(param).then((response) => {
                 this.baseInfo = response.data;
+                console.log("this.baseInfo",this.baseInfo)
                 // this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime])
                 this.materialList = this.baseInfo.detailList;
                 // supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {

src/views/foodManage/supplierFunction/supplierQuotation/edit.vue

@@ -45,7 +45,26 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                     <template slot="label">备注</template>
-                    {{ baseInfo.remark }}
+                    {{ baseInfo.inquiryNotes }}
+                </el-descriptions-item>
+                <el-descriptions-item label="所属区域" prop="areaId">
+                    <el-cascader v-model="baseInfo.areaId"
+                        :options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+                        :props="{
+                        emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
+                        checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
+                        value:'id',label:'label'
+                        }" @change="handleAreaChange">
+                    </el-cascader>
+                </el-descriptions-item>
+                <el-descriptions-item label="邀请供应商" prop="supplierId">
+                    <el-select v-model="baseInfo.supplierId"  @change="handleSupplierChange" placeholder="请选择供应商" style="width: 100%;">
+                        <el-option v-for="item in supplierOptions"
+                            :key="item.supplierId"
+                            :label="item.supplierName"
+                            :value="item.supplierId"
+                        ></el-option>
+                    </el-select>
                 </el-descriptions-item>
             </el-descriptions>
         </div>
@@ -155,7 +174,7 @@
 import { imgUpLoadTwo } from '@/api/system/upload'
 import { systemAreaTreeApi } from "@/api/base/stall";
 import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi } from "@/api/foodManage/stockManage";
-import { getGoodsInquiryInfoApi,addGoodsInquiryApi,editGoodsInquiryApi } from "@/api/foodManage/purchaseManage";
+import { getGoodsInquiryInfoApi,addGoodsInquiryApi,editGoodsQuotationApi,getGoodsInquiryDetailInfoApi } from "@/api/foodManage/purchaseManage";
 export default {
     name: "SupplierQuotationEdit",
     dicts: [],
@@ -293,6 +312,18 @@ export default {
                 this.supplierOptions = response.rows||[];
             });
         },
+        handleSupplierChange(e){
+            let param = {
+                inquiryId:this.supplierQuotationData.inquiryId,
+                supplierId:this.baseInfo.supplierId
+            }
+            console.log("detailparam",param)
+            //查询
+            getGoodsInquiryDetailInfoApi(param).then((response) => {
+                console.log('response',response);
+                this.materialList = response.data;
+            });
+        },
         /** 查询货品类别下拉树结构 */
         getMaterialTree() {
            let param = {
@@ -409,7 +440,8 @@ export default {
                     this.$modal.msgError("请添加货品！");
                 }else{
                     this.loadingBtn=true;
-                    editGoodsInquiryApi(param).then((response) => {
+                    console.log("param",param)
+                    editGoodsQuotationApi(param).then((response) => {
                         this.$modal.msgSuccess("修改成功");
                         this.loadingBtn=false
                         this.jumpList()

src/views/foodManage/supplierFunction/supplierQuotation/index.vue

@@ -56,13 +56,13 @@
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit" v-if="scope.row.orderStatus==1"
+                icon="el-icon-edit" v-if="scope.row.status==2"
                 @click="handleUpdate(scope.row)"
             >报价</el-button>
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit" v-if="scope.row.orderStatus==2"
+                icon="el-icon-edit" v-if="scope.row.status>2"
                 @click="handleView(scope.row)"
             >详情</el-button>
             </template>