食堂管理BUG

src/views/base/canteenInfo-detail.vue

@@ -36,7 +36,7 @@
                 >
             </el-time-picker>
         </el-form-item>
-        <el-form-item label="早餐金额（元）" prop="outsourcerDiningFee1" style="width:450px">
+        <el-form-item label="早餐金额（元）" prop="outsourcerDiningFee1" style="width:470px">
             <el-input type="number" v-model="formModel.outsourcerDiningFee1"></el-input>
         </el-form-item>
         <el-form-item label="午餐时间" prop="diningTimeRange2">
@@ -52,7 +52,7 @@
                 >
             </el-time-picker>
         </el-form-item>
-        <el-form-item label="午餐金额（元）" prop="outsourcerDiningFee2" style="width:450px">
+        <el-form-item label="午餐金额（元）" prop="outsourcerDiningFee2" style="width:470px">
             <el-input type="number" v-model="formModel.outsourcerDiningFee2"></el-input>
         </el-form-item>
         <el-form-item label="晚餐时间" prop="diningTimeRange3">
@@ -68,7 +68,7 @@
                 >
             </el-time-picker>
         </el-form-item>
-        <el-form-item label="晚餐金额（元）" prop="outsourcerDiningFee3" style="width:450px">
+        <el-form-item label="晚餐金额（元）" prop="outsourcerDiningFee3" style="width:470px">
             <el-input type="number" v-model="formModel.outsourcerDiningFee3"></el-input>
         </el-form-item> 
         <el-form-item label="宵夜时间" prop="diningTimeRange4">
@@ -84,7 +84,7 @@
                 >
             </el-time-picker>
         </el-form-item>
-        <el-form-item label="宵夜金额（元）" prop="outsourcerDiningFee4" style="width:450px">
+        <el-form-item label="宵夜金额（元）" prop="outsourcerDiningFee4" style="width:470px">
             <el-input type="number" v-model="formModel.outsourcerDiningFee4"></el-input>
         </el-form-item>
         
@@ -103,7 +103,20 @@ export default {
   props: ["businessKey", "title"],
   data() {
     return {
-      formModel: {},
+      formModel: {
+        id:"",
+        name:"",
+        address:"",
+        diningTimeRange1:"",
+        diningTimeRange2:"",
+        diningTimeRange3:"",
+        diningTimeRange4:"",
+        outsourcerDiningFee1:"",
+        outsourcerDiningFee2:"",
+        outsourcerDiningFee3:"",
+        outsourcerDiningFee4:"",
+
+      },
       ruleValidate: {
         name: [
           { required: true, message: "食堂名称不能为空", trigger: "blur" }
@@ -210,53 +223,55 @@ export default {
         self.loading = false;
 
         if (jsonData.result) {
-            self.formModel = jsonData.data;
 
-            self.canteenDiningList = jsonData.data.canteenDiningList;
+            //self.formModel = jsonData.data;
+            self.formModel.id = jsonData.data.id
 
+            self.formModel.name = jsonData.data.name
 
-            if(self.formModel.canteenDiningObjMap!=null){
+            self.formModel.address = jsonData.data.address;
 
-              if(self.formModel.canteenDiningObjMap["diningTimeRange1"]!=null){
-                  var diningTimeRange1 = self.formModel.canteenDiningObjMap["diningTimeRange1"]
 
+            if(jsonData.data.canteenDiningObjMap!=null){
+
+              if(jsonData.data.canteenDiningObjMap["diningTimeRange1"]!=null){
+                  var diningTimeRange1 = jsonData.data.canteenDiningObjMap["diningTimeRange1"]
                   var diningTimeRangeArray1 = diningTimeRange1.split(",");
                   self.formModel.diningTimeRange1 = diningTimeRangeArray1;
-
               }
 
-              if(self.formModel.canteenDiningObjMap["diningTimeRange2"]!=null){
-                  var diningTimeRange2 = self.formModel.canteenDiningObjMap["diningTimeRange2"];
+              if(jsonData.data.canteenDiningObjMap["diningTimeRange2"]!=null){
+                  var diningTimeRange2 = jsonData.data.canteenDiningObjMap["diningTimeRange2"];
                   var diningTimeRangeArray2 = diningTimeRange2.split(",");
                   self.formModel.diningTimeRange2 = diningTimeRangeArray2;
               }
 
-              if(self.formModel.canteenDiningObjMap["diningTimeRange3"]!=null){
-                  var dinnerTimeRange3 = self.formModel.canteenDiningObjMap["diningTimeRange3"];
+              if(jsonData.data.canteenDiningObjMap["diningTimeRange3"]!=null){
+                  var dinnerTimeRange3 = jsonData.data.canteenDiningObjMap["diningTimeRange3"];
                   var dinnerTimeRangeArray3 = dinnerTimeRange3.split(",");
                   self.formModel.diningTimeRange3 = dinnerTimeRangeArray3;
               }
 
-              if(self.formModel.canteenDiningObjMap["diningTimeRange4"]!=null){
-                  var dinnerTimeRange4 =self.formModel.canteenDiningObjMap["diningTimeRange4"];
+              if(jsonData.data.canteenDiningObjMap["diningTimeRange4"]!=null){
+                  var dinnerTimeRange4 =jsonData.data.canteenDiningObjMap["diningTimeRange4"];
                   var dinnerTimeRangeArray4 = dinnerTimeRange4.split(",");
                   self.formModel.diningTimeRange4 = dinnerTimeRangeArray4;
               }
 
-              if(self.formModel.canteenDiningObjMap["outsourcerDiningFee1"]!=null){
-                  self.formModel.outsourcerDiningFee1 = self.formModel.canteenDiningObjMap["outsourcerDiningFee1"]
+              if(jsonData.data.canteenDiningObjMap["outsourcerDiningFee1"]!=null){
+                  self.formModel.outsourcerDiningFee1 = jsonData.data.canteenDiningObjMap["outsourcerDiningFee1"];
               }
 
-              if(self.formModel.canteenDiningObjMap["outsourcerDiningFee2"]!=null){
-                self.formModel.outsourcerDiningFee2 = self.formModel.canteenDiningObjMap["outsourcerDiningFee2"]
+              if(jsonData.data.canteenDiningObjMap["outsourcerDiningFee2"]!=null){
+                self.formModel.outsourcerDiningFee2 = jsonData.data.canteenDiningObjMap["outsourcerDiningFee2"]
               }
 
-              if(self.formModel.canteenDiningObjMap["outsourcerDiningFee3"]!=null){
-                self.formModel.outsourcerDiningFee3 = self.formModel.canteenDiningObjMap["outsourcerDiningFee3"]
+              if(jsonData.data.canteenDiningObjMap["outsourcerDiningFee3"]!=null){
+                self.formModel.outsourcerDiningFee3 = jsonData.data.canteenDiningObjMap["outsourcerDiningFee3"]
               }
 
-              if(self.formModel.canteenDiningObjMap["outsourcerDiningFee4"]!=null){
-                self.formModel.outsourcerDiningFee4 = self.formModel.canteenDiningObjMap["outsourcerDiningFee4"]
+              if(jsonData.data.canteenDiningObjMap["outsourcerDiningFee4"]!=null){
+                self.formModel.outsourcerDiningFee4 = jsonData.data.canteenDiningObjMap["outsourcerDiningFee4"]
               }
             }
 

src/views/business/carryThingsOutFactory-list.vue

@@ -15,30 +15,27 @@
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
 
-      <el-form-item label="申请人" prop="personId">
-        <el-input type="text" size="mini" v-model="queryModel.personId"></el-input>
+      <el-form-item label="申请人" prop="personName">
+        <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
       </el-form-item>
       <el-form-item label="部门" prop="companyId">
         <el-select-tree
           size="mini"
           :props="props"
           :options="companyResult"
-          v-model="queryModel.parentId"
+          v-model="queryModel.companyId"
           height="200"
         ></el-select-tree
-        >&nbsp;
-        <el-checkbox v-model="queryModel.subordinate"
-          >是否包含下级单位</el-checkbox
         >
       </el-form-item>
       <el-form-item label="审批状态" prop="auditStatus">
-        <el-select v-model="queryModel.auditStatus" size="mini" style="width:100px;" clearable>
+        <el-select v-model="queryModel.auditStatus" size="mini" clearable>
           <el-option v-for="(item,index) in auditStatusList" 
           :label="item.name" :value="item.value" :key="index"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="出厂状态" prop="releaseStatus">
-        <el-select v-model="queryModel.releaseStatus" size="mini" style="width:100px;" clearable>
+        <el-select v-model="queryModel.releaseStatus" size="mini"  clearable>
           <el-option v-for="(item,index) in releaseStatusList" 
           :label="item.name" :value="item.value" :key="index"></el-option>
         </el-select>
@@ -55,7 +52,7 @@
           value-format="yyyy-MM-dd">
           </el-date-picker>
       </el-form-item>
-      <el-form-item label="审核时间" prop="auditTime">
+      <!-- <el-form-item label="审批时间" prop="auditTime">
         <el-date-picker
           size="mini"
           v-model="queryModel.auditTimeRange"
@@ -66,7 +63,7 @@
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd">
           </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"
@@ -125,6 +122,13 @@
       @size-change="pageSizeChange"
       layout="total, sizes, prev, pager, next, jumper"
     ></el-pagination>
+    <auditStatus-list
+        v-if="showModal"
+        :businessKey="businessKey"
+        :parentId="selectedRecord.id"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+    ></auditStatus-list>
   </div>
 </template>
 <script>
@@ -134,6 +138,7 @@ import pageUtil from "@/utils/page";
 import "nprogress/nprogress.css"; // progress bar style
 import SelectTree from "@/components/SelectTree";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
+import auditStatusList from "./auditStatus-list";
 
 export default {
   name: 'BusinessCarryThingsOutFactoryList',
@@ -142,7 +147,12 @@ export default {
 
     return {
       queryModel: {
-        name: "",
+        personName: "",
+        companyId:"",
+        auditStatus:"",
+        releaseStatus:"",
+        createTimeRange:"",
+        auditTimeRange:"",
       },
       canteenId:"",
       loading: false,
@@ -182,7 +192,7 @@ export default {
           "name":"未出厂"
         },
         {
-          "value":"0",
+          "value":"1",
           "name":"已出厂"
         }
       ],
@@ -220,8 +230,15 @@ export default {
       self.pageIndex = pageIndex;
       var formData = new FormData();
 
-    formData.append("pageIndex", self.pageIndex);
-    formData.append("pageSize", self.pageSize);
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("personName", self.queryModel.personName);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("auditStatus", self.queryModel.auditStatus);
+      formData.append("releaseStatus", self.queryModel.releaseStatus);
+      formData.append("createTimeRange", self.queryModel.createTimeRange);
+      formData.append("auditTimeRange", self.queryModel.auditTimeRange);
 
       carryThingsOutFactoryApi
         .pageList(formData)
@@ -260,6 +277,9 @@ export default {
     },
     handleReset(name) {
       this.$refs[name].resetFields();
+      this.queryModel.createTimeRange="";
+      this.queryModel.auditTimeRange="";
+      this.queryModel.companyId="";
     },
     handleAdd() {
       this.modalTitle = "新增";
@@ -334,7 +354,8 @@ export default {
     },
   },
   components: {
-    "el-select-tree": SelectTree
+    "el-select-tree": SelectTree,
+    "auditStatus-list": auditStatusList,
   },
   mounted: function() {
     var self = this;