From dd1ac44876444ea7cebbf827b7f41a21d5dccb2f Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 2 Jul 2025 10:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseManage/contractList/detail.vue    | 531 +++++++++++-------
 .../purchaseManage/contractList/edit.vue      | 156 +++--
 .../purchaseManage/contractList/index.vue     |  10 +-
 3 files changed, 452 insertions(+), 245 deletions(-)

diff --git a/src/views/foodManage/purchaseManage/contractList/detail.vue b/src/views/foodManage/purchaseManage/contractList/detail.vue
index 57155f1a..4b4e6777 100644
--- a/src/views/foodManage/purchaseManage/contractList/detail.vue
+++ b/src/views/foodManage/purchaseManage/contractList/detail.vue
@@ -1,206 +1,339 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              
-      <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>
-      </el-form-item>
-    </el-form>
+    <div style="padding: 10px;background: #E5EBF6;min-height: 830px;">
+        <div style="background: #FFF;padding: 10px;border-radius: 10px;margin-bottom: 20px;"> 
+          <el-descriptions style="margin-bottom: 20px;" title="基本信息" :column="4" size="medium" border>  
+              <el-descriptions-item>
+                  <template slot="label">合同编号</template>
+                  {{baseInfo.contractCode}}
+              </el-descriptions-item> 
+              <el-descriptions-item>
+                  <template slot="label">合同标题</template>
+                  {{ baseInfo.contractTitle }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                  <template slot="label">所属区域</template>
+                  {{ baseInfo.areaName }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                  <template slot="label">供应商</template>
+                  {{ baseInfo.supplierName }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                  <template slot="label">配送食堂</template>
+                  {{ baseInfo.canteenName }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                  <template slot="label">签订日期</template>
+                  {{ baseInfo.contractSigningTime }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                  <template slot="label">合同生效周期</template>
+                  {{ baseInfo.contractStartTime }} - {{ baseInfo.contractEndTime }}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                  <template slot="label">合同状态</template>
+                  {{ baseInfo.deptName }}
+                  <el-tag size="small" v-if="baseInfo.contractStatus==1">待生效</el-tag>
+                  <el-tag size="small" v-if="baseInfo.contractStatus==2">履行中</el-tag>
+                  <el-tag size="small" v-if="baseInfo.contractStatus==3">已失效</el-tag>
+                  <el-tag size="small" v-if="baseInfo.contractStatus==4">已终止</el-tag>  
+              </el-descriptions-item>
+              <el-descriptions-item>
+                  <template slot="label">合同附件</template>
+                  <!-- {{ baseInfo.deptName }} -->
+              </el-descriptions-item>  
+          </el-descriptions>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>  
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+          <el-descriptions style="margin-bottom: 20px;" title="付款信息" :column="4" size="medium" border>  
+              <el-descriptions-item>
+                  <template slot="label">付款方式</template>
+                  <span v-if="baseInfo.payMoneyStyle==1">一次性付款</span>
+                  <span v-if="baseInfo.payMoneyStyle==2">分期付款</span>
+              </el-descriptions-item> 
+              <el-descriptions-item>
+                  <template slot="label">付款日期</template>
+                  {{ baseInfo.payMoneyDate }}
+              </el-descriptions-item> 
+              <el-descriptions-item>
+                  <template slot="label">收款银行</template>
+                  {{ baseInfo.collectMoneyBank }}
+              </el-descriptions-item> 
+              <el-descriptions-item>
+                  <template slot="label">收款账户名称</template>
+                  {{ baseInfo.collectMoneyAccountName }}
+              </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">备注</template>
+                  {{ baseInfo.remark }}
+              </el-descriptions-item>  
+          </el-descriptions>
+        </div>
 
-    <el-table v-loading="loading" :data="tableListData" height="800">
-      <el-table-column label="序号" align="center" width="80" type="index">
-        <template slot-scope="scope">
-          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="编号" align="center" prop="canteenNum" :show-overflow-tooltip="true" width="100" fixed="left"/>
-      <el-table-column label="名称" align="center" prop="canteenName" :show-overflow-tooltip="true" width="150" fixed="left"/>
-      <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"
-            @click="handleUpdate(scope.row)" 
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)" 
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
-
-
-
-         
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        <div style="width: 100%;height: 450px;padding: 10px;border-radius: 10px;margin-bottom: 10px;background: #FFF;">
+            <div style="width: 100%;display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
+                <div>
+                    货品信息
+                </div> 
+            </div>
+            <div style="width: 100%;height: 400px;overflow-y: auto;">
+                <el-table v-loading="loading" :data="contractMaterialList" 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" />  -->
+                    <el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
+                            <span v-if="scope.row.salesMode==1">按份</span>
+                            <span v-if="scope.row.salesMode==2">称重</span>
+                        </template> -->
+                    </el-table-column> 
+                    <el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                          <span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span>
+                        </template>
+                    </el-table-column> 
+                    <el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true"></el-table-column> 
+                    <el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.orderNum*scope.row.singlePrice }}</span>
+                        </template>
+                    </el-table-column> 
+                    <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"></el-table-column>
+                </el-table>
+            </div>
+        </div>
+        <div style="width: 100%;height: 80px;padding: 10px;background: #FFF;border-radius: 10px;display: flex;align-items: center;justify-content: center;">
+            <!-- <el-button type="primary" @click="confirmSave" :loading="loadingBtn">保存草稿</el-button> -->
+            <el-button @click="jumpList">返回</el-button>
+        </div> 
+    </div>
 </template>
-
-<script> 
-import { getPageCanteenApi } from "@/api/base/canteen";
-
+  
+<script>
+import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall"; 
+import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi } from "@/api/foodManage/purchaseManage"; 
+import { getPurchaseContractInfoApi,addPurchaseContractApi,editPurchaseContractApi,delPurchaseContractApi } from "@/api/foodManage/purchaseManage";
 export default {
-  name: "",
-  dicts: [],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      //表格数据
-      tableListData: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false, 
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        canteenName: undefined,
-        areaNameStr: undefined, 
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      //   canteenName: [
-      //     { required: true, message: "字典名称不能为空", trigger: "blur" }
-      //   ],
-      //   dictType: [
-      //     { required: true, message: "字典类型不能为空", trigger: "blur" }
-      //   ]
-      }
-    };
-  },
-  created() { 
-  //   this.getList();
-  },
-  methods: { 
-      /** 搜索按钮操作 */
-      handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() { 
-          this.resetForm("queryForm");
-          this.handleQuery();
-      },
-      /** 查询列表 */
-      getList() {
-          this.loading = true;
-          let param = {
-            "current": this.queryParams.pageNum, 
-            "size": this.queryParams.pageSize,  
-          }
-          getPageCanteenApi(param).then(response => {
-              this.tableListData = response.records;
-              this.total = Number(response.total);
-              this.loading = false;
-          });
-      },  
-      /** 新增按钮操作 */
-      handleAdd() {
-          this.reset();
-          this.open = true;
-          this.title = "新增";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-          this.reset();
-          // const dictId = row.dictId || this.ids
-          // getType(dictId).then(response => {
-              // this.form = response.data;
-              this.open = true;
-              this.title = "修改";
-          // });
-      },
-      // 取消按钮
-      cancel() {
-          this.open = false;
-          this.reset();
-      },
-      // 表单重置
-      reset() {
-          this.form = {};
-          this.resetForm("form");
-      }, 
-      /** 提交按钮 */
-      submitForm: function() {
-          this.$refs["form"].validate(valid => {
-          if (valid) {
-              if (this.form.dictId != undefined) {
-                  // updateType(this.form).then(response => {
-                  //     this.$modal.msgSuccess("修改成功");
-                  //     this.open = false;
-                  //     this.getList();
-                  // });
-              } else {
-                  // addType(this.form).then(response => {
-                  //     this.$modal.msgSuccess("新增成功");
-                  //     this.open = false;
-                  //     this.getList();
-                  // });
-              }
-          }
-          });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-          const dictIds = row.dictId || this.ids;
-          this.$modal.confirm('是否确认删除数据项？').then(function() {
-              // return delType(dictIds);
-          }).then(() => {
-              this.getList();
-              this.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
-      },
-  }
+    name: "ContractDetail",
+    dicts: [],
+    data() {
+      return {
+        pageJson:{},//页面传参
+        loading:false,
+        loadingBtn:false,
+        baseInfo: { 
+            contractTitle:undefined,
+            contractType:undefined,
+            areaId:undefined,
+            canteenId:undefined, 
+            dateRange:[], 
+        },
+        // 表单校验
+        baseRules: {
+            contractTitle: [
+                { required: true, message: "菜谱名称不能为空", trigger: "blur" }
+            ],
+            areaId: [
+                { required: true, message: "所属区域不能为空", trigger: "change" }
+            ],
+            canteenId: [
+                { required: true, message: "所属食堂不能为空", trigger: "change" }
+            ],
+            supplierId: [
+                { required: true, message: "供应商不能为空", trigger: "change" }
+            ],
+            contractSigningTime: [
+                { required: true, message: "签订日期不能为空", trigger: "change" }
+            ],
+            dateRange: [
+                { required: true, message: "合同生效周期不能为空", trigger: "change" }
+            ]
+        },
+        treeAreaOptions:[],
+        canteenOptions:[],
+        supplierOptions:[],
+        stallOptions:[],
+        
+        pickerOptions: { 
+            disabledDate(v) {
+                return v.getTime() < (new Date().getTime() - 86400000);//  - 86400000是否包括当天
+            }
+        },
+        contractMaterialList:[],  
+        openDialog:false,
+        materialTreeOptions:[], 
+        // 查询参数
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10, 
+        },
+        // 总条数
+        total: 0,
+        //表格数据
+        tableListData: [],
+        batchChosenMaterial:[],
+        noMaterial:false,
+      };
+    },
+    created() { 
+        if(this.$route.query.pageJson){ 
+            this.pageJson = JSON.parse(this.$route.query.pageJson)
+            this.getContractInfo()
+        }
+    },
+    methods: { 
+        // 返回列表页
+        jumpList() {
+            const obj = { path: "foodManage/purchaseManage/contractDetail" };
+            this.$tab.closeOpenPage(obj);
+            this.$router.replace({ path: "/foodManage/purchaseManage/contractList" }); // 要打开的页面 
+        },
+        getContractInfo(){
+            console.log(this.pageJson) 
+            let param = {
+                contractId:this.pageJson.contractId
+            }
+            //查询查询食堂下拉结构
+            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.$set(this.baseInfo,"contractAmount",this.baseInfo.contractAmount/100)
+                getCanteenByAreaApi({areaId:this.baseInfo.areaId}).then((response) => {
+                    this.canteenOptions=response.rows||[];
+                    this.$set(this.baseInfo,"canteenId",this.baseInfo.canteenId)
+                });
+                supplierPageApi({ isPaging:1,areaIdList:[this.baseInfo.areaId] }).then((response) => {
+                    this.supplierOptions = response.rows||[];
+                    this.$set(this.baseInfo,'supplierId',this.baseInfo.supplierId) 
+                });   
+            }); 
+        },  
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            // this.batchIds1 = selection.map(item => item.tradeId)
+            // this.single = selection.length !== 1
+            // this.multiple = !selection.length
+        },
+        
+        //日期
+        formatDate(date) {
+            // 格式化为 YYYY-MM-DD
+            date = new Date(date)
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
+            const day = String(date.getDate()).padStart(2, '0');
+            return `${year}-${month}-${day}`;
+        },
+        //日期时间
+        formatDateTime(date) {
+            // 格式化为 YYYY-MM-DD
+            date = new Date(date)
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
+            const day = String(date.getDate()).padStart(2, '0');
+            const hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+            const minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+            const seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+            return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        } 
+    }
 };
 </script>
+<style scoped>
+    .dishes-card{
+        width: 20%;
+        height: 100%;
+        margin-right: 15px;
+        position: relative;
+    }
+    .body-card{
+        width: 96%;
+        margin: 10px auto;
+        display: flex;
+        flex-direction: column;
+        height: 300px;
+        overflow-y: auto;
+    }
+
+    .bottom-card{
+        width: 100%;
+        height: 60px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: absolute;
+        bottom: 0;
+    }
+
+
+    .dialog-left{
+        width: 20%;
+        height: 100%;
+    }
+    .dish-name{
+        width: 100%;
+        height: 32px;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+    }
+    .dish-name:hover{ 
+        background-color:rgba(0, 0, 0, 0.1);
+        color: #4b80fd;
+    } 
+
+    .dialog-center{
+        width: 10%;
+        height: 100%;
+        /* background: #4b80fd; */
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        margin: 0 1%;
+    }
+    .dialog-center-header{
+        width: 100%;display: flex;align-items: center;justify-content: center;height: 60px;font-weight: bold;border-bottom: 1px solid #ccc;
+    }
+    .dialog-right{
+        width: 70%;
+        height: 100%;
+    }
+    .primary{
+        background: #1890ff!important;
+        color: #fff!important;
+    }
+    .dateTable{
+        width: 14%;
+        height: 40px;
+        color: #9a9da3;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #e6ebf5;
+    }
+    .dateTable2{
+        width: 14%;
+        height: 40px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #fff;
+        color:#000;
+        border: 1px solid #e6ebf5;
+        cursor: pointer;
+    }
+    .bgBlue{
+        width: 14%;
+        height: 40px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #0c6ccc;
+        color:#fff !important;
+        border: 1px solid #fff;
+        cursor: pointer;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/foodManage/purchaseManage/contractList/edit.vue b/src/views/foodManage/purchaseManage/contractList/edit.vue
index 0d52e119..4d9b8493 100644
--- a/src/views/foodManage/purchaseManage/contractList/edit.vue
+++ b/src/views/foodManage/purchaseManage/contractList/edit.vue
@@ -111,11 +111,11 @@
                     <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
-                    <el-table-column label="货品规格" align="center" prop="salesMode" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
                             <span v-if="scope.row.salesMode==1">按份</span>
                             <span v-if="scope.row.salesMode==2">称重</span>
-                        </template>
+                        </template> -->
                     </el-table-column> 
                     <el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
@@ -141,8 +141,8 @@
             </div>
         </div>
         <div style="width: 100%;height: 80px;padding: 10px;background: #FFF;border-radius: 10px;display: flex;align-items: center;justify-content: center;">
-            <el-button type="primary" @click="confirmSubmit" :loading="loadingBtn">提 交</el-button>
-            <el-button @click="jumpList">返 回</el-button>
+            <el-button type="primary" @click="confirmSave" :loading="loadingBtn">保存草稿</el-button>
+            <el-button @click="confirmSubmit">提交</el-button>
         </div>
  
         <!-- 选择菜品 -->
@@ -183,11 +183,11 @@
                     <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" /> 
                     <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
-                    <el-table-column label="货品规格" align="center" prop="salesMode" :show-overflow-tooltip="true">
-                        <template slot-scope="scope">
+                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
+                        <!-- <template slot-scope="scope">
                             <span v-if="scope.row.salesMode==1">按份</span>
                             <span v-if="scope.row.salesMode==2">称重</span>
-                        </template>
+                        </template> -->
                     </el-table-column> 
                     <el-table-column label="单价（元）" align="center" prop="unitPrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
@@ -421,53 +421,121 @@ export default {
                 },500) 
             } 
         },
-        // 提交按钮
-        confirmSubmit(){
+        //保存草稿
+        confirmSave(){
             this.$refs["baseInfo"].validate(valid => {
-                if (valid) {
-                    console.log(this.baseInfo)
+                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
-                    param.purchaseContractDetailList = []
-                    console.log(this.contractMaterialList) 
-                    this.noMaterial = true;
-                    if(this.contractMaterialList.length>0){
-                        this.noMaterial = false;
+                    param.contractAmount = this.baseInfo.contractAmount*100;
+                    param.commitStatus=1
+                    param.purchaseContractDetailList = [] 
+                    this.noMaterial = false;
+                    if(this.contractMaterialList.length>0){ 
                         this.contractMaterialList.forEach(item=>{
-                            let obj = Object.assign({}, item)
-                            obj.singlePrice = Number(obj.singlePrice)*100
-                            param.purchaseContractDetailList.push(obj)
+                            if(item.singlePrice==0 || item.orderNum==0){
+                                this.noMaterial = true
+                            }else{
+                                let obj = Object.assign({}, item)
+                                obj.singlePrice = Number(obj.singlePrice)*100
+                                param.purchaseContractDetailList.push(obj)
+                            } 
                         }) 
                     } 
-                    console.log(param)
                     if(this.noMaterial){
-                        this.$modal.msgError("请添加货品！");
+                        this.$modal.msgError("请输入单价和数量！");
                     }else{
-                        this.loadingBtn=true;
-                        if (this.baseInfo.contractId != undefined) {
-                            editPurchaseContractApi(param).then((response) => {
-                                this.$modal.msgSuccess("修改成功");
-                                this.loadingBtn=false
-                                this.jumpList() 
-                            }).catch(() => {
-                                this.loadingBtn=false
-                            }); 
-                        } else {
-                            addPurchaseContractApi(param).then((response) => {
-                                this.$modal.msgSuccess("保存成功");
-                                this.loadingBtn=false
-                                this.jumpList() 
-                            }).catch(() => {
-                                this.loadingBtn=false
-                            }); 
-                             
-                        }
-                        
-                    }
+                        this.noMaterial = true;
+                        if(this.contractMaterialList.length>0){
+                            this.noMaterial = false; 
+                        } 
+                        console.log(param)
+                        if(this.noMaterial){
+                            this.$modal.msgError("请添加货品！");
+                        }else{
+                            this.loadingBtn=true;
+                            if (this.baseInfo.contractId != undefined) {
+                                editPurchaseContractApi(param).then((response) => {
+                                    this.$modal.msgSuccess("修改成功");
+                                    this.loadingBtn=false
+                                    this.jumpList() 
+                                }).catch(() => {
+                                    this.loadingBtn=false
+                                }); 
+                            } else {
+                                addPurchaseContractApi(param).then((response) => {
+                                    this.$modal.msgSuccess("保存成功");
+                                    this.loadingBtn=false
+                                    this.jumpList() 
+                                }).catch(() => {
+                                    this.loadingBtn=false
+                                });  
+                            }
+                            
+                        } 
+                    } 
+                }
+            });
+        },
+        // 提交按钮
+        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;
+                    param.commitStatus=2
+                    param.purchaseContractDetailList = [] 
+                    this.noMaterial = false;
+                    if(this.contractMaterialList.length>0){ 
+                        this.contractMaterialList.forEach(item=>{
+                            if(item.singlePrice==0 || item.orderNum==0){
+                                this.noMaterial = true
+                            }else{
+                                let obj = Object.assign({}, item)
+                                obj.singlePrice = Number(obj.singlePrice)*100
+                                param.purchaseContractDetailList.push(obj)
+                            } 
+                        }) 
+                    } 
+                    if(this.noMaterial){
+                        this.$modal.msgError("请输入单价和数量！");
+                    }else{
+                        this.noMaterial = true;
+                        if(this.contractMaterialList.length>0){
+                            this.noMaterial = false; 
+                        } 
+                        console.log(param)
+                        if(this.noMaterial){
+                            this.$modal.msgError("请添加货品！");
+                        }else{
+                            this.loadingBtn=true;
+                            if (this.baseInfo.contractId != undefined) {
+                                editPurchaseContractApi(param).then((response) => {
+                                    this.$modal.msgSuccess("修改成功");
+                                    this.loadingBtn=false
+                                    this.jumpList() 
+                                }).catch(() => {
+                                    this.loadingBtn=false
+                                }); 
+                            } else {
+                                addPurchaseContractApi(param).then((response) => {
+                                    this.$modal.msgSuccess("保存成功");
+                                    this.loadingBtn=false
+                                    this.jumpList() 
+                                }).catch(() => {
+                                    this.loadingBtn=false
+                                });  
+                            }
+                            
+                        } 
+                    } 
                 }
             });
         },
diff --git a/src/views/foodManage/purchaseManage/contractList/index.vue b/src/views/foodManage/purchaseManage/contractList/index.vue
index d21ba57f..b2f8d905 100644
--- a/src/views/foodManage/purchaseManage/contractList/index.vue
+++ b/src/views/foodManage/purchaseManage/contractList/index.vue
@@ -107,9 +107,15 @@
             <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-edit" v-if="scope.row.commitStatus==1"
                 @click="handleUpdate(scope.row)" 
             >编辑</el-button>
+            <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit" v-if="scope.row.commitStatus==2"
+                @click="handleView(scope.row)" 
+            >详情</el-button>
             <el-button
                 size="mini"
                 type="text"
@@ -271,7 +277,7 @@ export default {
         },
         /** 修改按钮操作 */
         handleView(row) { 
-            // this.$router.push({ path: "/foodManage/purchaseManage/contractDetail",query: {pageJson:JSON.stringify(row)} });
+            this.$router.push({ path: "/foodManage/purchaseManage/contractDetail",query: {pageJson:JSON.stringify(row)} });
         },
         /** 修改按钮操作 */
         handleUpdate(row) {