bug修改

src/views/dashboard/index.vue

@@ -135,11 +135,11 @@ import {personReceive} from "@/api/material/transfer";
 import {getPersonalTaskList} from '@/api/meeting/enforce'
 import {getTodoMeetinStatistics} from '@/api/meeting/meeting'
 import {getEnforceRemindCount} from '@/api/meeting/enforceRemind'
-
+import TaskDetail from "../task/components/taskDetail"
 
 export default {
   name: 'Dashboard',
-  components: {},
+  components: {TaskDetail},
   computed: {
     ...mapGetters([
       'name'
@@ -252,7 +252,7 @@ export default {
           auditResult: undefined,
           auditOpinion: undefined
         }
-        this.detailOpen = true;
+        this.auditOpen = true;
       })
     },
 
@@ -263,7 +263,7 @@ export default {
           auditTask(this.auditForm).then(res => {
             this.resetForm("auditForm");
             this.getTaskList();
-            this.detailOpen = false
+            this.auditOpen = false
             this.$message.success("操作成功");
           })
         }

src/views/material/asset.vue

@@ -176,7 +176,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="数量" prop="num" v-if="form.assetType==='1'">
-              <el-input-number v-model="form.num"></el-input-number>
+              <el-input-number v-model="form.num" :min="1"></el-input-number>
             </el-form-item>
             <!--            <el-form-item label="设备设施名称" prop="equipmentName">-->
             <!--              <el-input v-model="form.equipmentName" placeholder="请输入设备设施名称" maxlength="30"/>-->
@@ -399,7 +399,9 @@ export default {
       },
       total: 0,
       assetList: [],
-      form: {},
+      form: {
+        num: 1
+      },
       accessoryList: [],
       title: '',
       open: false,
@@ -414,6 +416,9 @@ export default {
         assetType: [
           {required: true, message: "资产类型不能为空", trigger: "change"}
         ],
+        num: [
+          {required: true, message: "数量不能为空", trigger: "change"}
+        ],
         source: [
           {required: true, message: "入库来源不能为空", trigger: "change"}
         ],
@@ -477,7 +482,7 @@ export default {
         assetNumber: undefined,
         deptAssetNumber: undefined,
         assetType: undefined,
-        num: undefined,
+        num: 1,
         equipmentName: undefined,
         equipmentType: undefined,
         equipmentNumber: undefined,
@@ -587,7 +592,9 @@ export default {
               this.getList();
             });
           } else {
-            this.form.categoryId = this.form.categoryId[this.form.categoryId.length - 1]
+            if (typeof this.form.categoryId != 'string') {
+              this.form.categoryId = this.form.categoryId[this.form.categoryId.length - 1]
+            }
             addAsset(this.form).then(response => {
               this.$message.success("入库成功");
               this.open = false;

src/views/system/user.vue

@@ -138,7 +138,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -206,7 +206,14 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="生日" prop="birthday">
-              <el-input v-model="form.birthday" placeholder="请输入生日" maxlength="11"/>
+              <el-date-picker
+                v-model="form.birthday"
+                type="date"
+                size="mini"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                placeholder="选择生日">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/task/view.vue

@@ -442,9 +442,17 @@ export default {
             this.form.fileUrl = JSON.stringify(files)
           }
           addTaskFeedback(this.form).then(res => {
-            this.$message.success("反馈成功");
-            this.open = false;
-            this.getList();
+            if (res.code === 'S.F-2001') {
+              let message=''
+              res.data.forEach(item=>{
+                message+=item.taskName+'   '
+              })
+              this.$alert(message, res.message);
+            } else {
+              this.$message.success("反馈成功");
+              this.open = false;
+              this.getList();
+            }
           });
         }
       })