页面优化

src/views/farm/project/index.vue

@@ -172,7 +172,7 @@
         <el-form-item label="优先级" prop="weight">
           <el-input v-model="form.weight" placeholder="请输入数字(1第一优先,99最后优先)" />
         </el-form-item>
-        <el-form-item label="唯一占用：" prop="state">
+        <el-form-item label="项目状态" prop="state">
           <el-radio-group v-model="form.state">
             <el-radio :label="0">计划中</el-radio>
             <el-radio :label="1">进行中</el-radio>

src/views/farm/resource/index.vue

@@ -57,6 +57,8 @@
         </template>
       </el-table-column>
       <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="数量" align="center" prop="number" />
       <!-- <el-table-column label="征文" align="center" prop="content" /> -->
       <el-table-column label="图片" align="center" prop="images" >
         <template slot-scope="scope">
@@ -81,6 +83,12 @@
           <el-button type="success" v-if="!scope.row.solo">任意</el-button>
         </template>
       </el-table-column>
+      <el-table-column label="占用状态" align="center" prop="occupied" >
+        <template slot-scope="scope">
+          <el-button type="danger" v-if="scope.row.occupied">已被占用</el-button>
+          <el-button type="success" v-if="!scope.row.occupied">未被占用</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -110,6 +118,13 @@
         <el-form-item label="资源名称：" prop="name">
           <el-input v-model="form.name" placeholder="请输入" />
         </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="数量" prop="number">
+          <el-input v-model="form.number" placeholder="请输入" />
+        </el-form-item>
+
         <el-form-item label="资源描述：">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
@@ -299,12 +314,15 @@ export default {
         if (this.form.images == "") {
             this.form.images = [];
           }else{
-            let imgArr = this.form.images.split(",")
-            this.form.images = imgArr;
+            let imgType = typeof(this.form.images);
+            if(imgType == "string"){
+              let imgArr = this.form.images.split(",");
+              this.form.images = imgArr;
+            }
           }
           return;
       }
-      if (this.form.images == undefined) {
+      if (this.form.images == undefined || this.form.images == "") {
           this.form.images = [];
       }
     },

src/views/farm/task/index.vue

@@ -256,6 +256,14 @@
         <el-form-item label="优先级" prop="weight">
           <el-input v-model="form.weight" placeholder="请输入优先级" />
         </el-form-item>
+        <el-form-item label="任务状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio :label="0">计划中</el-radio>
+            <el-radio :label="1">准备中 </el-radio>
+            <el-radio :label="2">已开始</el-radio>
+            <el-radio :label="4">完成</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -372,6 +380,7 @@ export default {
     this.getProjectList();
     this.getResource();
     this.getCpUserList();
+    // this.twoRescoure();
   },
   methods: {
     startMethod(){
@@ -382,7 +391,7 @@ export default {
       this.getCropList();
       this.getTaskCateList();
       this.getAreasList();
-      this.twoRescoure();
+      // this.twoRescoure();
     },
     executorPersonConvert(executorPerson){
       let executorPersonName = "";
@@ -476,7 +485,9 @@ export default {
         pageNo: 1,
         pageSize: 10,
       }).then(res => {
+        console.log(111111111, res.data.list);
         this.resourceList = res.data.list;
+        this.twoRescoure();
         this.getList();
       })
     },