Merge branch 'master' of http://7j2563k302.imdo.co/humingbo/aivfo-oa-web

src/components/FileUpload/index.vue

@@ -51,25 +51,24 @@ export default {
   },
   methods: {
     handleRemove(file, fileList) {
-      this.fileList = fileList
-      deleteFile(file.url).then(res => {
-        this.$message({
-          message: '操作成功!',
-          type: 'success'
-        });
+      let fileName = file.name.indexOf('oa-file/') === 0 ? file.name : 'oa-file/' + file.name
+      deleteFile(fileName).then(res => {
+        this.$message.success('操作成功!');
+        this.fileList = fileList
+        this.$emit('removeFile', fileList)
       });
-      this.$emit('removeFile', fileList)
     },
     handleSuccess(response, file, fileList) {
       this.fileList = fileList
       this.$emit('getFileUrl', fileList)
     },
     handleError() {
-      this.$message({
-        message: '上传失败，请稍候再试!',
-        type: 'warning'
-      });
+      this.$message.error('上传失败，请稍候再试!');
     },
+    clear() {
+      this.fileList = []
+    }
+
   }
 }
 </script>

src/views/material/asset.vue

@@ -77,9 +77,9 @@
                   stripe
                   height="calc(100vh - 180px)"
                   size="mini">
-          <el-table-column label="资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
+          <el-table-column label="唯一编码" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
           <el-table-column label="物品名称" prop="assetName" min-width="100" :show-overflow-tooltip="true"/>
-          <el-table-column label="部门编号" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
+          <el-table-column label="公司资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
           <el-table-column label="资产类型" width="80">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.assetType==='1'" size="mini" type="warning">耗材</el-tag>
@@ -87,16 +87,17 @@
             </template>
           </el-table-column>
           <el-table-column label="设备型号" prop="equipmentType" :show-overflow-tooltip="true"/>
-          <el-table-column label="设备编号" prop="equipmentNumber" :show-overflow-tooltip="true"/>
-          <el-table-column label="原厂编号" prop="factoryNumber" :show-overflow-tooltip="true"/>
+<!--          <el-table-column label="设备编号" prop="equipmentNumber" :show-overflow-tooltip="true"/>-->
+<!--          <el-table-column label="原厂编号" prop="factoryNumber" :show-overflow-tooltip="true"/>-->
           <el-table-column label="生产厂家" prop="factoryName" :show-overflow-tooltip="true"/>
           <el-table-column label="购入日期" prop="buyDate"/>
           <el-table-column label="状态" width="90">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.status==='1'" type="success" size="mini">在库</el-tag>
-              <el-tag v-else-if="scope.row.status==='2'" size="mini">出库</el-tag>
-              <el-tag v-else-if="scope.row.status==='3'" size="mini" type="info">出库(不回库)</el-tag>
-              <el-tag v-else size="mini" type="warning">报失</el-tag>
+              <el-tag v-if="scope.row.status==='1'" type="success">在库</el-tag>
+              <el-tag v-else-if="scope.row.status==='2'">出库</el-tag>
+              <el-tag v-else-if="scope.row.status==='3'" type="info">出库(不回库)</el-tag>
+              <el-tag v-else-if="scope.row.status==='4'" type="warning">报失</el-tag>
+              <el-tag v-else type="danger">报失</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="160">
@@ -159,11 +160,11 @@
             <el-form-item label="物品名称" prop="assetName">
               <el-input v-model="form.assetName" placeholder="请输入资产名称" maxlength="30"/>
             </el-form-item>
-            <el-form-item label="资产编号" prop="assetNumber">
-              <el-input v-model="form.assetNumber" placeholder="请输入资产编号" maxlength="30"/>
+            <el-form-item label="公司资产编号" prop="assetNumber">
+              <el-input v-model="form.assetNumber" placeholder="请输入公司资产编号" maxlength="30"/>
             </el-form-item>
-            <el-form-item label="部门编号" prop="deptAssetNumber">
-              <el-input v-model="form.deptAssetNumber" placeholder="请输入资产编号" disabled/>
+            <el-form-item label="唯一编码" prop="deptAssetNumber">
+              <el-input v-model="form.deptAssetNumber" disabled/>
             </el-form-item>
             <el-form-item label="资产类型" prop="assetType">
               <el-radio-group v-model="form.assetType">
@@ -177,18 +178,18 @@
             <el-form-item label="数量" prop="num" v-if="form.assetType==='1'">
               <el-input-number v-model="form.num"></el-input-number>
             </el-form-item>
-            <el-form-item label="设备设施名称" prop="equipmentName">
-              <el-input v-model="form.equipmentName" placeholder="请输入设备设施名称" maxlength="30"/>
-            </el-form-item>
+<!--            <el-form-item label="设备设施名称" prop="equipmentName">-->
+<!--              <el-input v-model="form.equipmentName" placeholder="请输入设备设施名称" maxlength="30"/>-->
+<!--            </el-form-item>-->
             <el-form-item label="设备型号" prop="equipmentType">
               <el-input v-model="form.equipmentType" placeholder="请输入设备型号" maxlength="30"/>
             </el-form-item>
-            <el-form-item label="设备编号" prop="equipmentNumber">
-              <el-input v-model="form.equipmentNumber" placeholder="请输入设备编号" maxlength="30"/>
-            </el-form-item>
-            <el-form-item label="原厂编号" prop="factoryNumber">
-              <el-input v-model="form.factoryNumber" placeholder="请输入原厂编号"></el-input>
-            </el-form-item>
+<!--            <el-form-item label="设备编号" prop="equipmentNumber">-->
+<!--              <el-input v-model="form.equipmentNumber" placeholder="请输入设备编号" maxlength="30"/>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="原厂编号" prop="factoryNumber">-->
+<!--              <el-input v-model="form.factoryNumber" placeholder="请输入原厂编号"></el-input>-->
+<!--            </el-form-item>-->
             <el-form-item label="生产厂家" prop="factoryName">
               <el-input v-model="form.factoryName" placeholder="请输入生产厂家"></el-input>
             </el-form-item>
@@ -271,10 +272,10 @@
             <el-form-item label="物品名称" prop="assetName">
               <div>{{ transferForm.assetName }}</div>
             </el-form-item>
-            <el-form-item label="资产编号" prop="assetNumber">
+            <el-form-item label="公司资产编号" prop="assetNumber">
               <div>{{ transferForm.assetNumber }}</div>
             </el-form-item>
-            <el-form-item label="部门编号" prop="deptAssetNumber">
+            <el-form-item label="唯一编码" prop="deptAssetNumber">
               <div>{{ transferForm.deptAssetNumber }}</div>
             </el-form-item>
             <el-form-item label="设备型号" prop="equipmentType">

src/views/material/components/assetDetail.vue

@@ -6,28 +6,28 @@
           <el-form-item label="物品名称" prop="assetName">
             <div>{{ form.assetName }}</div>
           </el-form-item>
-          <el-form-item label="资产编号" prop="assetNumber">
-            <div>{{ form.assetNumber }}</div>
-          </el-form-item>
-          <el-form-item label="部门编号" prop="deptAssetNumber">
+          <el-form-item label="唯一编码" prop="deptAssetNumber">
             <div>{{ form.deptAssetNumber }}</div>
           </el-form-item>
+          <el-form-item label="公司资产编号" prop="assetNumber">
+            <div>{{ form.assetNumber }}</div>
+          </el-form-item>
           <el-form-item label="资产类型" prop="assetType">
             <el-tag v-if="form.assetType===1" size="mini" type="warning">耗材</el-tag>
             <el-tag v-else size="mini" type="success">固定资产</el-tag>
           </el-form-item>
-          <el-form-item label="设备设施名称" prop="equipmentName">
-            <div>{{ form.equipmentName }}</div>
-          </el-form-item>
+<!--          <el-form-item label="设备设施名称" prop="equipmentName">-->
+<!--            <div>{{ form.equipmentName }}</div>-->
+<!--          </el-form-item>-->
           <el-form-item label="设备型号" prop="equipmentType">
             <div>{{ form.equipmentType }}</div>
           </el-form-item>
-          <el-form-item label="设备编号" prop="equipmentNumber">
-            <div>{{ form.equipmentNumber }}</div>
-          </el-form-item>
-          <el-form-item label="原厂编号" prop="factoryNumber">
-            <div>{{ form.factoryNumber }}</div>
-          </el-form-item>
+<!--          <el-form-item label="设备编号" prop="equipmentNumber">-->
+<!--            <div>{{ form.equipmentNumber }}</div>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="原厂编号" prop="factoryNumber">-->
+<!--            <div>{{ form.factoryNumber }}</div>-->
+<!--          </el-form-item>-->
           <el-form-item label="生产厂家" prop="factoryName">
             <div>{{ form.factoryName }}</div>
           </el-form-item>

src/views/material/myReceive.vue

@@ -23,9 +23,9 @@
               row-key="id"
               :row-class-name="rowClassName"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column label="资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="唯一编码" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="公司资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
       <el-table-column label="物品名称" prop="assetName" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门编号" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
       <el-table-column label="资产类型" width="80">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.assetType==='1'" size="mini" type="warning">耗材</el-tag>
@@ -33,8 +33,8 @@
         </template>
       </el-table-column>
       <el-table-column label="设备型号" prop="equipmentType" :show-overflow-tooltip="true"/>
-      <el-table-column label="设备编号" prop="equipmentNumber" :show-overflow-tooltip="true"/>
-      <el-table-column label="原厂编号" prop="factoryNumber" :show-overflow-tooltip="true"/>
+<!--      <el-table-column label="设备编号" prop="equipmentNumber" :show-overflow-tooltip="true"/>-->
+<!--      <el-table-column label="原厂编号" prop="factoryNumber" :show-overflow-tooltip="true"/>-->
       <el-table-column label="生产厂家" prop="factoryName" :show-overflow-tooltip="true"/>
       <el-table-column label="领用日期" prop="receiveDate">
         <template slot-scope="scope">

src/views/meeting/weekly.vue

@@ -95,7 +95,7 @@
     </div>
 
     <!-- 任务详情对话框 -->
-    <el-dialog title="任务详情" :visible.sync="taskOpen" width="680px" append-to-body
+    <el-dialog title="任务详情" :visible.sync="taskOpen" width="760px" append-to-body
                :close-on-click-modal="false">
       <task-detail :detail-form="taskForm"></task-detail>
     </el-dialog>

src/views/task/projectView.vue

@@ -145,7 +145,7 @@
           </el-col>
         </el-row>
         <el-form-item label="附件" prop="fileUrl">
-          <file-upload @getFileUrl="getFileUrl" @removeFile="removeFile"></file-upload>
+          <file-upload ref="fu" @getFileUrl="getFileUrl" @removeFile="removeFile"></file-upload>
         </el-form-item>
         <el-form-item label="描述" prop="description">
           <el-input v-model="form.description" type="textarea" autosize/>
@@ -160,7 +160,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="任务详情" :visible.sync="openDetail" width="680px" class="feed-dialog" append-to-body>
+    <el-dialog title="任务详情" :visible.sync="openDetail" width="760px" class="feed-dialog" append-to-body>
       <task-detail :detailForm="detailForm"></task-detail>
     </el-dialog>
 
@@ -227,7 +227,7 @@ export default {
   methods: {
     initData() {
       let today = new Date();
-      let month = [DateUtil.beforeDay(today, 13), DateUtil.afterDay(today, 15)];
+      let month = [DateUtil.beforeDay(today, 15), DateUtil.afterDay(today, 15)];
       this.$set(this.queryParams, 'rangeDate', month)
       this.getList()
       getProjectTree().then(res => {
@@ -334,8 +334,9 @@ export default {
     // 取消按钮
     cancel() {
       this.$refs.rtEditor.clear()
-      this.open = false;
+      this.$refs.fu.clear()
       this.reset();
+      this.open = false;
     },
     // 表单重置
     reset() {
@@ -363,10 +364,12 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          let files = this.form.files.map(item => item.name);
-          this.form.fileUrl = JSON.stringify(files)
+          if (this.form.files) {
+            let files = this.form.files.map(item => item.name);
+            this.form.fileUrl = JSON.stringify(files)
+          }
           addTaskFeedback(this.form).then(res => {
-            this.$message.success("反馈成功");
+            this.$message.success("评论成功");
             this.open = false;
             this.getList();
           });

src/views/task/task.vue

@@ -186,7 +186,7 @@
           </el-col>
         </el-row>
         <el-form-item label="任务附件">
-          <file-upload :files="form.fileList" @getFileUrl="getFileUrl" @removeFile="removeFile"></file-upload>
+          <file-upload ref="fu" :files="form.fileList" @getFileUrl="getFileUrl" @removeFile="removeFile"></file-upload>
         </el-form-item>
         <el-form-item label="任务描述" prop="description">
           <rich-text-editor ref="rtEditor" :value="form.description"
@@ -230,7 +230,7 @@
         </el-form-item>
         <el-form-item label="所属项目：">
           <span>{{ splitForm.projectName }}</span>
-          <el-button type="text" icon="el-icon-circle-plus-outline"
+          <el-button type="primary" plain circle icon="el-icon-plus"
                      style="float: right; padding: -1px 3px" @click="addChild"></el-button>
         </el-form-item>
         <div style="display: flex;justify-content: flex-start;flex-wrap:wrap">
@@ -238,8 +238,9 @@
             <div slot="header" class="clearfix">
               <div class="card-header">
                 <div style="margin-top: 5px">子任务{{ index + 1 }}</div>
-                <el-button type="text" icon="el-icon-delete" @click="delChild(index)"
-                           style="float: right;color: red; padding: 3px 0"></el-button>
+                <el-button type="danger" circle @click="delChild(index)" icon="el-icon-delete"
+                           style="float: right;">
+                </el-button>
               </div>
             </div>
             <el-form ref="splitChild" :model="child" :rules="rules" size="mini">
@@ -452,6 +453,7 @@ export default {
     cancel() {
       this.$refs.dut2.clearText()
       this.$refs.rtEditor.clear()
+      this.$refs.fu.clear()
       this.reset()
       this.open = false;
     },
@@ -583,6 +585,7 @@ export default {
           break
       }
     },
+
     /** 审核按钮操作 */
     handleAudit(row) {
       getTask(row.id).then(res => {
@@ -613,8 +616,10 @@ export default {
         if (valid) {
           this.form.beginDate = this.form.rangeDate[0]
           this.form.endDate = this.form.rangeDate[1]
-          let tempFiles = this.form.files.map(item => item.name);
-          this.form.fileUrl = JSON.stringify(tempFiles)
+          if (this.form.files) {
+            let tempFiles = this.form.files.map(item => item.name);
+            this.form.fileUrl = JSON.stringify(tempFiles)
+          }
           this.form.checkTaskConflict = true;
           if (!this.form.id) {
             addTask(this.form).then(res => {
@@ -639,6 +644,7 @@ export default {
         }
       });
     },
+
     submitConfirm() {
       if (this.open) {
         this.form.checkTaskConflict = false;
@@ -660,8 +666,8 @@ export default {
           this.$message.success("操作成功");
         })
       }
-    }
-    ,
+    },
+
     cancelConfirm() {
       this.open = false;
       this.splitOpen = false;
@@ -672,8 +678,7 @@ export default {
         dutSplit[key].clearText()
       }
       this.resetForm("splitForm");
-    }
-    ,
+    },
 
     /** 审核提交按钮 */
     submitAudit() {
@@ -687,8 +692,8 @@ export default {
           })
         }
       });
-    }
-    ,
+    },
+
     /** 分解任务提交按钮 */
     submitSplit() {
       if (this.splitForm.children.length === 0) {
@@ -707,8 +712,10 @@ export default {
         return
       }
       this.splitForm.children.forEach(c => {
-        let files = c.files.map(item => item.name);
-        c.fileUrl = JSON.stringify(files)
+        if (c.files) {
+          let files = c.files.map(item => item.name);
+          c.fileUrl = JSON.stringify(files)
+        }
       })
       this.splitForm.checkTaskConflict = true;
       splitTask(this.splitForm).then(res => {
@@ -722,9 +729,7 @@ export default {
           this.$message.success("操作成功");
         }
       })
-
-    }
-    ,
+    },
 
     /** 终止按钮操作 */
     handleUpdate(row) {
@@ -735,8 +740,7 @@ export default {
         this.$message.success("终止成功");
       }).catch(() => {
       });
-    }
-    ,
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$confirm('是否确认删除任务编号为"' + row.id + '"的数据项？').then(() => {
@@ -746,8 +750,7 @@ export default {
         this.$message.success("删除成功");
       }).catch(() => {
       });
-    }
-    ,
+    },
 
     addChild() {
       let child = {
@@ -758,15 +761,13 @@ export default {
         description: undefined
       }
       this.splitForm.children.push(child)
-    }
-    ,
+    },
     delChild(index) {
       this.splitForm.children.splice(index, 1)
     }
-    ,
+
   }
-}
-;
+};
 </script>
 <style scoped lang="scss">
 .split-form {

src/views/task/view.vue

@@ -176,7 +176,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="附件" prop="fileUrl">
-              <file-upload @getFileUrl="getFileUrl" @removeFile="removeFile"></file-upload>
+              <file-upload ref="fu" @getFileUrl="getFileUrl" @removeFile="removeFile"></file-upload>
             </el-form-item>
           </el-col>
         </el-row>
@@ -194,7 +194,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="任务详情" :visible.sync="openDetail" width="680px" class="feed-dialog" append-to-body>
+    <el-dialog title="任务详情" :visible.sync="openDetail" width="760px" class="feed-dialog" append-to-body>
       <task-detail :detailForm="detailForm"></task-detail>
     </el-dialog>
 
@@ -407,6 +407,7 @@ export default {
     // 取消按钮
     cancel() {
       this.$refs.rtEditor.clear();
+      this.$refs.fu.clear();
       this.open = false;
       this.reset();
     },
@@ -436,8 +437,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          let files = this.form.files.map(item => item.name);
-          this.form.fileUrl = JSON.stringify(files)
+          if (this.form.files) {
+            let files = this.form.files.map(item => item.name);
+            this.form.fileUrl = JSON.stringify(files)
+          }
           addTaskFeedback(this.form).then(res => {
             this.$message.success("反馈成功");
             this.open = false;