图片上传

1

src/components/ImageCropper/index.vue

@@ -213,7 +213,6 @@ export default {
           formData.append(key, this.dataObj[key]);
         }
         formData.append(filename, data, fileName);
-        console.log(this.ossUploadUrl, "this.ossUploadUrl", action);
         axios
           .post(action, formData, {
             ...headers,

src/views/main/schedule-branch/modals/create.vue

@@ -6,7 +6,7 @@
           <el-form-item
             label="分部"
             prop="organId"
-            :rules="[{required: true, message: '请选择分部'}]"
+            :rules="[{ required: true, message: '请选择分部' }]"
           >
             <el-select
               clearable
@@ -15,10 +15,12 @@
               :disabled="!isCreate"
               placeholder="请选择分部"
             >
-              <el-option v-for="(item,index) in selects.branchs"
+              <el-option
+                v-for="(item, index) in selects.branchs"
                 :key="index"
                 :label="item.name"
-                :value="item.id"></el-option>
+                :value="item.id"
+              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -26,23 +28,28 @@
           <el-form-item
             label="工作周期"
             prop="month"
-            :rules="[{required: true, message: '请选择工作周期'}]"
+            :rules="[{ required: true, message: '请选择工作周期' }]"
           >
             <el-date-picker
               v-model="form.month"
               :disabled="!isCreate"
               type="month"
-              placeholder="请选择工作周期">
+              placeholder="请选择工作周期"
+            >
             </el-date-picker>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row class="group" v-for="(groupItem, groupIndex) in form.group" :key="groupIndex">
+      <el-row
+        class="group"
+        v-for="(groupItem, groupIndex) in form.group"
+        :key="groupIndex"
+      >
         <el-col :span="6">
           <el-form-item
             label="乐团主管"
             :prop="`group.${groupIndex}.userId`"
-            :rules="[{required: true, message: '请选择乐团主管'}]"
+            :rules="[{ required: true, message: '请选择乐团主管' }]"
           >
             <el-select
               clearable
@@ -51,16 +58,29 @@
               :disabled="!isCreate"
               placeholder="请选择乐团主管"
             >
-              <el-option v-for="(item,index) in technicians"
+              <el-option
+                v-for="(item, index) in technicians"
                 :key="index"
                 :label="item.realName"
-                :disabled="form.group.map(m => m.userId).includes(item.userId)"
-                :value="item.userId"></el-option>
+                :disabled="
+                  form.group.map((m) => m.userId).includes(item.userId)
+                "
+                :value="item.userId"
+              >
+                <span style="float: left">{{ item.realName }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                  item.userId
+                }}</span>
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <template v-for="(matterItem, matterIndex) in groupItem.matter">
-          <el-col :offset="matterIndex === 0 ? 0 : 6" :span="6" :key="groupIndex + '-' + matterIndex + '1'">
+          <el-col
+            :offset="matterIndex === 0 ? 0 : 6"
+            :span="6"
+            :key="groupIndex + '-' + matterIndex + '1'"
+          >
             <el-form-item
               :label="'任务事项' + (matterIndex + 1)"
               :prop="`group.${groupIndex}.matter.${matterIndex}.item`"
@@ -72,11 +92,15 @@
                 :disabled="!isCreate && !!matterItem.item"
                 placeholder="请选择任务事项"
               >
-                <el-option v-for="(item,index) in matterTypesOptions"
+                <el-option
+                  v-for="(item, index) in matterTypesOptions"
                   :key="index"
                   :label="item.label"
-                  :disabled="groupItem.matter.map(m => m.item).includes(item.value)"
-                  :value="item.value"></el-option>
+                  :disabled="
+                    groupItem.matter.map((m) => m.item).includes(item.value)
+                  "
+                  :value="item.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -85,36 +109,50 @@
               :label="'任务次数' + (matterIndex + 1)"
               :prop="`group.${groupIndex}.matter.${matterIndex}.times`"
             >
-              <el-input clearable v-model="matterItem.times" placeholder="请输入次数" />
+              <el-input
+                clearable
+                v-model="matterItem.times"
+                placeholder="请输入次数"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6" :key="groupIndex + '-' + matterIndex + '3'">
             <div class="ctrl">
               <span>
-                <el-tooltip content="添加任务" placement="top" :open-delay=".5">
+                <el-tooltip
+                  content="添加任务"
+                  placement="top"
+                  :open-delay="0.5"
+                >
                   <el-button
                     icon="el-icon-plus"
                     @click="createMatter(groupItem.matter)"
                     circle
-                    
                   ></el-button>
                 </el-tooltip>
-                <el-tooltip content="删除任务" placement="top" :open-delay=".5">
+                <el-tooltip
+                  content="删除任务"
+                  placement="top"
+                  :open-delay="0.5"
+                >
                   <el-button
                     icon="el-icon-minus"
                     circle
-                    
                     @click="removeMatter(groupItem.matter, matterIndex)"
                     :disabled="groupItem.matter.length <= 1"
                   ></el-button>
                 </el-tooltip>
               </span>
-              <el-tooltip  v-if="isCreate" content="删除乐团主管" placement="top" :open-delay=".5">
+              <el-tooltip
+                v-if="isCreate"
+                content="删除乐团主管"
+                placement="top"
+                :open-delay="0.5"
+              >
                 <el-button
                   icon="el-icon-delete"
                   circle
                   type="danger"
-                  
                   v-if="matterIndex === 0"
                   @click="removeGroup(form.group, groupIndex)"
                   :disabled="form.group.length <= 1"
@@ -124,146 +162,169 @@
           </el-col>
         </template>
       </el-row>
-      <el-button v-if="isCreate" @click="createGroup" plain block style="width: 100%">添加乐团主管</el-button>
+      <el-button
+        v-if="isCreate"
+        @click="createGroup"
+        plain
+        block
+        style="width: 100%"
+        >添加乐团主管</el-button
+      >
     </el-form>
-    <div slot="footer" style="text-align: right;margin-top: 20px;">
+    <div slot="footer" style="text-align: right; margin-top: 20px">
       <el-button @click="$emit('close')">取消</el-button>
       <el-button type="primary" @click="submit">确认</el-button>
     </div>
   </div>
 </template>
 <script>
-import { matterTypes } from '@/views/main/constant'
-import { objectToOptions } from '@/utils'
-import { createRandom } from '@/helpers/uuidv4'
-import { inspectionAdd, inspectionGetInfo, inspectionUpdate, getMusicGroupEduTeacher } from '@/views/main/api'
-import { getOrganRole } from '@/api/buildTeam'
+import { matterTypes } from "@/views/main/constant";
+import { objectToOptions } from "@/utils";
+import { createRandom } from "@/helpers/uuidv4";
+import {
+  inspectionAdd,
+  inspectionGetInfo,
+  inspectionUpdate,
+  getMusicGroupEduTeacher,
+} from "@/views/main/api";
+import { getOrganRole } from "@/api/buildTeam";
 const emptyMatter = {
-  item: '',
-  times: ''
-}
+  item: "",
+  times: "",
+};
 export default {
-  props: ['id'],
+  props: ["id"],
   data() {
     return {
       form: {
-        organId: '',
-        group: [{
-          _uuid: createRandom(),
-          userId: '',
-          matter: [{...emptyMatter}]
-        }]
+        organId: "",
+        group: [
+          {
+            _uuid: createRandom(),
+            userId: "",
+            matter: [{ ...emptyMatter }],
+          },
+        ],
       },
-      technicians: []
-    }
+      technicians: [],
+    };
   },
   computed: {
     matterTypesOptions() {
-      return objectToOptions(matterTypes)
+      return objectToOptions(matterTypes);
     },
     isCreate() {
-      return !this.id
+      return !this.id;
     },
   },
   watch: {
-    async 'form.organId'() {
+    async "form.organId"() {
       if (this.form.organId) {
         try {
           const res = await getOrganRole({
             organId: this.form.organId,
-            rows: 999
-          })
-          this.technicians = res.data?.EDUCATION || []
+            rows: 999,
+          });
+          this.technicians = res.data?.EDUCATION || [];
           if (this.isCreate) {
-            this.$set(this.form, 'group', this.form.group.map(item => ({...item, userId: ''})))
+            this.$set(
+              this.form,
+              "group",
+              this.form.group.map((item) => ({ ...item, userId: "" }))
+            );
           }
         } catch (error) {}
       }
-    }
+    },
   },
   async mounted() {
     try {
       const res = await inspectionGetInfo({
-        id: this.id
-      })
+        id: this.id,
+      });
       this.form = {
         ...this.form,
         organId: res.data.organId,
         month: res.data.month,
-        group: [{
-          _uuid: createRandom(),
-          userId: res.data.userId,
-          matter: res.data.inspectionItems.map(item => ({item: item.item, times: item.times}))
-        }]
-      }
+        group: [
+          {
+            _uuid: createRandom(),
+            userId: res.data.userId,
+            matter: res.data.inspectionItems.map((item) => ({
+              item: item.item,
+              times: item.times,
+            })),
+          },
+        ],
+      };
     } catch (error) {}
   },
   methods: {
     createGroup() {
       this.form.group.push({
-        userId: '',
-        matter: [{...emptyMatter}]
-      })
+        userId: "",
+        matter: [{ ...emptyMatter }],
+      });
     },
     createMatter(matter) {
-      matter.push({...emptyMatter})
+      matter.push({ ...emptyMatter });
     },
     removeMatter(matter, index) {
-      matter.splice(index, 1)
+      matter.splice(index, 1);
     },
     async removeGroup(group, index) {
       try {
-        await this.$confirm('是否确认删除此乐团主管?', '提示', {
-          type: 'warning'
-        })
-        group.splice(index, 1)
+        await this.$confirm("是否确认删除此乐团主管?", "提示", {
+          type: "warning",
+        });
+        group.splice(index, 1);
       } catch (error) {}
     },
     async submit() {
       try {
-        this.$refs.form.validate(async valid => {
+        this.$refs.form.validate(async (valid) => {
           if (valid) {
-            const data = this.form.group.map(item => ({
+            const data = this.form.group.map((item) => ({
               organId: this.form.organId,
               month: this.form.month,
               userId: item.userId,
-              inspectionItems: item.matter.map(m => ({
+              inspectionItems: item.matter.map((m) => ({
                 ...m,
                 organId: this.form.organId,
                 month: this.form.month,
-              }))
-            }))
+              })),
+            }));
             if (this.isCreate) {
-              await inspectionAdd(data)
-              this.$message.success('创建成功')
+              await inspectionAdd(data);
+              this.$message.success("创建成功");
             } else {
               await inspectionUpdate({
                 ...data[0],
                 id: this.id,
-              })
-              this.$message.success('修改成功')
+              });
+              this.$message.success("修改成功");
             }
-            this.$emit('close')
-            this.$emit('submited')
+            this.$emit("close");
+            this.$emit("submited");
           }
-        })
+        });
       } catch (error) {}
-    }
-  }
-}
+    },
+  },
+};
 </script>
 <style lang="less" scoped>
-.group{
+.group {
   background-color: rgba(0, 0, 0, 0.05);
   padding: 10px;
   border-radius: 3px;
   margin-bottom: 10px;
 }
-.ctrl{
+.ctrl {
   margin-top: 45px;
   display: flex;
   justify-content: space-between;
-  i{
+  i {
     font-size: 24px;
   }
 }