From 219f95ef447355d55c8cc37847a4ee7e1cd9f3ea Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期二, 31 五月 2022 21:09:25 +0800
Subject: [PATCH] 提交代码

---
 src/views/construction/constructionBatch/index.vue |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/construction/constructionBatch/index.vue b/src/views/construction/constructionBatch/index.vue
index 946b5c3..852e68c 100644
--- a/src/views/construction/constructionBatch/index.vue
+++ b/src/views/construction/constructionBatch/index.vue
@@ -24,7 +24,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['oa:constructionBatch:add']"
         >鏂板</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -35,7 +34,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['oa:constructionBatch:edit']"
         >淇敼</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -46,7 +44,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['oa:constructionBatch:remove']"
         >鍒犻櫎</el-button>
       </el-col>
     </el-row>
@@ -61,7 +58,7 @@
       <el-table-column label="鏂藉伐鎵规" align="center" prop="batch" />
       <el-table-column label="鏂藉伐鍛ㄦ湡" align="center" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') + ' - ' + parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ scope.row.startDate + ' - ' + scope.row.endDate }}</span>
         </template>
       </el-table-column>
       <el-table-column label="璐熻矗浜�" align="center" prop="userId_dictText" />
@@ -74,7 +71,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:constructionBatch:edit']"
           >淇敼</el-button>
           <el-button
             size="mini"
@@ -82,7 +78,6 @@
             class="del-btn"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:constructionBatch:remove']"
           >鍒犻櫎</el-button>
         </template>
       </el-table-column>
@@ -97,22 +92,24 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀规柦宸ユ壒娆″璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="鏂藉伐鎵规" prop="batch">
           <el-input v-model="form.batch" maxlength="64" show-word-limit placeholder="璇疯緭鍏ユ柦宸ユ壒娆�" />
         </el-form-item>
         <el-form-item label="鏂藉伐鍛ㄦ湡" prop="date">
           <el-date-picker
+              style="width: 100%"
               v-model="form.date"
               type="daterange"
+              value-format="yyyy-MM-dd"
               range-separator="鑷�"
               start-placeholder="寮�濮嬫棩鏈�"
               end-placeholder="鎴嚦鏃ユ湡">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="璐熻矗浜�" prop="userId">
-          <el-select v-model="form.userId" filterable placeholder="璇烽�夋嫨璐熻矗浜�">
+          <el-select v-model="form.userId" style="width: 100%" filterable placeholder="璇烽�夋嫨璐熻矗浜�">
             <el-option
                 v-for="item in userList"
                 :key="item.userId"
@@ -125,7 +122,7 @@
           <el-input v-model="form.teamMembers" type="textarea" rows="4" maxlength="64" show-word-limit placeholder="璇疯緭鍏ュ洟闃熸垚鍛�" />
         </el-form-item>
         <el-form-item label="澶囨敞" prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" rows="6" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�" />
+          <el-input v-model="form.remarks" type="textarea" rows="10" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -142,6 +139,12 @@
 
 export default {
   name: "ConstructionBatch",
+  props: {
+    schoolId: {
+      type: Number,
+      default: undefined
+    }
+  },
   data() {
     return {
       // 鎸夐挳loading
@@ -193,6 +196,11 @@
       userList: []
     };
   },
+  watch: {
+    'schoolId': function () {
+      this.getList()
+    }
+  },
   created() {
     this.getList();
   },
@@ -200,7 +208,7 @@
     /** 鏌ヨ鏂藉伐鎵规鍒楄〃 */
     getList() {
       this.loading = true;
-      listConstructionBatch(this.queryParams).then(response => {
+      listConstructionBatch(Object.assign({}, this.queryParams, {schoolId: this.schoolId})).then(response => {
         this.constructionBatchList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -264,8 +272,9 @@
       const id = row.id || this.ids
       getConstructionBatch(id).then(response => {
         this.loading = false;
-        this.form = response.data;
-        this.form.date = [this.form.startDate, this.form.endDate]
+        // this.form = response.data;
+        const localDate = [response.data.startDate, response.data.endDate];
+        this.form = Object.assign({}, response.data, {date: localDate})
         this.open = true;
         this.title = "淇敼鏂藉伐鎵规";
       });
@@ -273,11 +282,11 @@
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        console.log(this.form.date)
         this.form.startDate = this.form.date[0];
         this.form.endDate = this.form.date[1];
         if (valid) {
           this.buttonLoading = true;
+          this.form.schoolId = this.schoolId;
           if (this.form.id != null) {
             updateConstructionBatch(this.form).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");

--
Gitblit v1.9.1