外协部门添加查询条件

src/views/base/canteenOutsourcerBalance-list.vue

@@ -21,6 +21,16 @@
       <el-form-item label="工号" prop="jobNumber">
         <el-input type="text" size="mini" v-model="queryModel.jobNumber"></el-input>
       </el-form-item>
+
+      <el-form-item label="部门" prop="companyId">
+        <el-select-tree
+          size="mini"
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>&nbsp;
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -112,6 +122,8 @@ import canteenOutsourcerBalanceApi from "@/api/base/canteenOutsourcerBalance";
 import pageUtil from "@/utils/page";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/base/companyInfo";
 
 export default {
   name: 'BaseCanteenOutsourcerBalanceList',
@@ -122,6 +134,7 @@ export default {
       queryModel: {
         name: "",
         jobNumber:"",
+        companyId:"",
       },
       canteenId:"",
       loading: false,
@@ -171,7 +184,15 @@ export default {
     };
   },
   created() {
+    var self = this;
+    companyInfoApi.outScourcerTreeList().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
 
+    this.loadTree();
   },
   methods: {
     indexMethod(index) {
@@ -191,6 +212,11 @@ export default {
 
     formData.append("name", self.queryModel.name);
     formData.append("jobNumber", self.queryModel.jobNumber);
+
+    if(self.queryModel.companyId!=null&&self.queryModel.companyId!=""){
+      formData.append("companyId", self.queryModel.companyId);
+    }
+    
     
 
       canteenOutsourcerBalanceApi
@@ -230,6 +256,7 @@ export default {
     },
     handleReset(name) {
       this.$refs[name].resetFields();
+      this.queryModel.companyId = "";
     },
     handleAdd() {
       this.modalTitle = "新增";
@@ -353,6 +380,7 @@ export default {
     "canteenDiningRecord-list": canteenDiningRecordList,
     "canteenOutsourcerRechargeRecord-list": canteenOutsourcerRechargeRecordList,
     "canteenOutsourcerRecharge":canteenOutsourcerRecharge,
+    "el-select-tree": SelectTree,
   }
 };
 </script>

src/views/base/meetingInfo-detail.vue

@@ -96,63 +96,53 @@
               label="序号"
               width="55"
             ></el-table-column>
-            <el-table-column prop="name" label="会议日期" width="300px">
-              <template slot-scope="scope">
-                <el-form-item
-                  :prop="'meetingTimeList.' + scope.$index + '.name'"
-                  :rules="ruleValidate['name']"
-                >
-                  <el-input
-                    placeholder="站点名称"
-                    v-model="scope.row.name"
-                    style="width: 250px"
-                  ></el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column prop="classify" label="会议时间" width="130px">
-              <template slot-scope="{ row }">
+            <el-table-column prop="name" label="会议日期" width="270px">
                 <el-form-item>
-                  <el-time-picker
-                    v-model="row.location"
-                    :picker-options="{
-                      selectableRange: '18:30:00 - 20:30:00'
-                    }"
-                    placeholder="任意时间点">
-                  </el-time-picker>
+                  <el-date-picker
+                    v-model="value1"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
                 </el-form-item>
-              </template>
             </el-table-column>
-            <el-table-column prop="location" label="会前签到时间">
-              <template slot-scope="{ row }">
+            <el-table-column prop="classify" label="会议时间" width="400px">
+               <el-form-item>
+                <el-time-picker
+                  is-range
+                  v-model="value1"
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  placeholder="选择时间范围">
+                </el-time-picker>
+               </el-form-item>
+            </el-table-column>
+            <el-table-column prop="location" label="会前签到时间" width="400px">
                 <el-form-item>
                   <el-time-picker
-                    v-model="row.location"
-                    :picker-options="{
-                      selectableRange: '18:30:00 - 20:30:00'
-                    }"
-                    placeholder="任意时间点">
+                    is-range
+                    v-model="value1"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="选择时间范围">
                   </el-time-picker>
                 </el-form-item>
-              </template>
             </el-table-column>
-            <el-table-column prop="name" label="结束签到时间" width="120px">
-              <template slot-scope="scope">
-                <el-form-item
-                  :prop="'meetingTimeList.' + scope.$index + '.radius'"
-                  :rules="ruleValidate['radius']"
-                >
+            <el-table-column prop="name" label="结束签到时间" width="400px">
+
+                <el-form-item>
                   <el-time-picker
-                    v-model="scope.row.radius"
-                    :picker-options="{
-                      selectableRange: '18:30:00 - 20:30:00'
-                    }"
-                    placeholder="任意时间点">
+                    is-range
+                    v-model="value1"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="选择时间范围">
                   </el-time-picker>
                 </el-form-item>
-              </template>
             </el-table-column>
-            <el-table-column label="操作" width="200">
+            <el-table-column label="操作" width="150">
               <template slot-scope="{ row }">
                 <el-form-item>
                   <i
@@ -329,6 +319,31 @@ export default {
         delFlag: 0,
       });
     },
+    handleDelete(row) {
+      var meetingTimeList = this.formModel.meetingTimeList;
+
+      meetingTimeList.splice(meetingTimeList.indexOf(row), 1);
+
+      this.formModel.removeMeetingTimeList.push(row);
+    },
+    handleUp(row) {
+      var meetingTimeList = this.formModel.meetingTimeList;
+      var index = meetingTimeList.indexOf(row);
+
+      if (index > 0) {
+        meetingTimeList.splice(index, 1);
+        meetingTimeList.splice(index - 1, 0, row);
+      }
+    },
+    handleDown(row) {
+      var meetingTimeList = this.formModel.meetingTimeList;
+      var index = meetingTimeList.indexOf(row);
+
+      if (index < meetingTimeList.length - 1) {
+        meetingTimeList.splice(index, 1);
+        meetingTimeList.splice(index + 1, 0, row);
+      }
+    },
   },
   mounted: function () {
     var self = this;