Merge remote-tracking branch 'origin/develop' into develop

src/views/task/new/index.vue

@@ -5,31 +5,31 @@
         <el-button
           size="mini"
           :type="formType == 1 ? 'primary' : 'default'"
-          @click="formType = 1"
           round
-          >体系审查任务</el-button
-        >
+          @click="formType = 1"
+          >体系审查任务
+        </el-button>
         <el-button
           size="mini"
           :type="formType == 2 ? 'primary' : 'default'"
-          @click="formType = 2"
           round
-          >车型审查任务</el-button
-        >
+          @click="formType = 2"
+          >车型审查任务
+        </el-button>
         <el-button
           size="mini"
           :type="formType == 3 ? 'primary' : 'default'"
-          @click="formType = 3"
           round
-          >车型检验任务</el-button
-        >
+          @click="formType = 3"
+          >车型检验任务
+        </el-button>
       </el-form-item>
 
       <div class="subtitle">基础信息</div>
       <el-row :gutter="20">
         <el-col :span="8">
-          <el-form-item label="任务编码" prop="status">
-            <el-input v-model="model.status" placeholder="请输入" clearable />
+          <el-form-item label="任务编号" prop="no">
+            <el-input v-model="model.no" placeholder="请输入" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -38,10 +38,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="任务状态" prop="status">
+          <el-form-item label="任务状态" prop="taskStatus">
             <el-select
+              v-model="model.taskStatus"
               style="width: 100%"
-              v-model="model.status"
               placeholder="请选择"
               clearable
             >
@@ -99,59 +99,82 @@
         </el-col>
       </el-row>
       <div class="subtitle">小组信息</div>
-
+      <!--  :default-sort="{ prop: 'createTime', order: 'descending' }"    -->
       <el-table
-        style="width: 100%; min-height: 50vh"
-        border
-        :default-sort="{ prop: 'createTime', order: 'descending' }"
         v-loading="loading"
+        style="width: 100%"
+        border
         :data="tableData"
       >
-        <el-table-column width="100" label="序号" sortable align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.$index + 1 }}</span>
+        <el-table-column label="姓名" align="left" prop="name">
+          <template slot-scope="{ row }">
+            <span v-if="row.name !== ''">{{ row.name }}</span>
+            <el-select
+              v-else
+              v-model="row.name"
+              placeholder="请选择"
+              @change="handleNameChange"
+            >
+              <el-option
+                v-for="(item, index) in userList"
+                :key="index"
+                :label="item.name"
+                :value="item.name"
+              >
+              </el-option>
+            </el-select>
           </template>
         </el-table-column>
-        <el-table-column
-          label="创建时间"
-          align="left"
-          sortable
-          prop="createTime"
-        >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
+        <el-table-column label="组内角色" align="left" prop="role">
+          <template slot-scope="{ row }">
+            <span v-if="row.name === ''">-</span>
+            <span v-else>{{ row.role }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="所属部门" align="left" prop="dept">
+          <template slot-scope="{ row }">
+            <span v-if="row.name === ''">-</span>
+            <span v-else>{{ row.dept }}</span>
           </template>
         </el-table-column>
         <el-table-column
           label="操作"
           align="left"
-          sortable
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
             <el-button
+              v-hasPermi="['setting:rules:update']"
               size="mini"
               type="primary"
               icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['setting:rules:update']"
               plain
-              >修改</el-button
+              @click="handleUpdate(scope.row)"
             >
+              修改
+            </el-button>
             <el-button
+              v-hasPermi="['setting:rules:delete']"
               size="mini"
               type="danger"
               icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['setting:rules:delete']"
               plain
-              >删除</el-button
+              @click="handleDelete(scope.row)"
             >
+              删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
+      <!-- 添加小组成员 -->
+      <el-button
+        class="add-number"
+        icon="el-icon-circle-plus-outline"
+        @click="handleAddNumber"
+        >添加小组成员</el-button
+      >
 
-      <div class="subtitle">报告信息</div>
+      <div class="subtitle" style="margin-top: 20px">报告信息</div>
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="样品名称" prop="status">
@@ -185,8 +208,8 @@
         <el-col :span="8">
           <el-form-item label="送样日期 " prop="status">
             <el-date-picker
-              style="width: 100%"
               v-model="model.status"
+              style="width: 100%"
               type="date"
               placeholder="选择日期"
             >
@@ -202,8 +225,8 @@
         <el-col :span="8">
           <el-form-item label="生产日期 " prop="status">
             <el-date-picker
-              style="width: 100%"
               v-model="model.status"
+              style="width: 100%"
               type="date"
               placeholder="选择日期"
             >
@@ -219,8 +242,8 @@
         <el-col :span="8">
           <el-form-item label="检验项目" prop="status">
             <el-select
-              style="width: 100%"
               v-model="model.status"
+              style="width: 100%"
               placeholder="请选择"
               clearable
             >
@@ -241,27 +264,27 @@
         type="primary"
         plain
         size="mini"
-        @click="handleAdd"
-        v-hasPermi="['setting:rules:add']"
         style="width: 120px"
-        >暂存</el-button
-      >
+        @click="handleSave"
+        >暂存
+      </el-button>
       <el-button
         type="primary"
         size="mini"
-        @click="handleAdd"
-        v-hasPermi="['setting:rules:add']"
         style="width: 120px"
-        >发布</el-button
-      >
+        @click="handleAdd"
+        >发布
+      </el-button>
     </div>
   </page-standard>
 </template>
 <script>
 export default {
+  dicts: ['sys_task_status', 'sys_pro'],
   data() {
     return {
       formType: 1,
+      // 新增/保存 - 对象
       model: {},
       loading: false,
       tableData: [],
@@ -273,11 +296,50 @@ export default {
           { required: true, message: '菜单顺序不能为空', trigger: 'blur' }
         ],
         path: [{ required: true, message: '路由地址不能为空', trigger: 'blur' }]
-      }
+      },
+      userList: [
+        { name: '小明', role: '组长', dept: '第一部门' },
+        { name: '小华', role: '组员', dept: '第一部门' },
+        { name: '小三', role: '组员', dept: '第一部门' },
+        { name: '小四', role: '组员', dept: '第一部门' },
+        { name: '小五', role: '组员', dept: '第一部门' }
+      ]
     }
   },
-  dicts: ['sys_task_status', 'sys_pro'],
   methods: {
+    /**
+     * 小组信息修改
+     * @param row 行内信息
+     */
+    handleUpdate(row) {},
+    /**
+     * 小组信息删除
+     * @param row 行内信息
+     */
+    handleDelete(row) {},
+    /**
+     * 添加小组成员点击按钮
+     */
+    handleAddNumber() {
+      console.log('aaa', this.tableData)
+      // 检验
+      if (this.tableData.length >= 1) {
+        const lastObj = this.tableData[this.tableData.length - 1]
+        if (lastObj.name === '') {
+          this.$message.error('请填写完此成员信息')
+          return
+        } else {
+          this.tableData.push({ name: '' })
+        }
+      } else {
+        this.tableData.push({ name: '' })
+      }
+    },
+    handleNameChange(value) {
+      const obj = this.userList.find(item => item.name === value)
+      this.tableData[this.tableData.length - 1].dept = obj.dept
+      this.tableData[this.tableData.length - 1].role = obj.role
+    },
     handleAvatarSuccess(res, file) {
       this.imageUrl = URL.createObjectURL(file.raw)
     },
@@ -292,8 +354,28 @@ export default {
         this.$message.error('上传头像图片大小不能超过 2MB!')
       }
       return isJPG && isLt2M
+    },
+    // 保存
+    handleAdd() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          console.log('aaaa')
+        }
+      })
+    },
+    // 暂存
+    handleSave() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          console.log('aaaa')
+        }
+      })
     }
   }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.add-number {
+  width: 100%;
+}
+</style>