Merge branch 'master' of http://111.61.77.35:9999/gengdidi/precision-effect

precision-effect-admin/src/main/java/com/zehong/web/controller/transaction/TBorrowingApplyForController.java

@@ -157,7 +157,7 @@ public class TBorrowingApplyForController extends BaseController
             tCashOperate.setOperateType("2");
             tCashOperate.setOperateAmount(tBorrowingApplyFor.getTotalFigures());
             tCashOperate.setIsDel("0");
-            tCashOperate.setDocumentType("2");
+            tCashOperate.setDocumentType("9");
             tCashOperate.setRelationDoc(String.valueOf(tBorrowingApplyFor.getBorrowing()));
             tCashOperate.setOperateTime(new Date());
              //增加资金操作记录

precision-effect-web/src/views/account/index.vue

@@ -200,7 +200,7 @@
             <el-option label="采购（报销）支出" value="4" />
             <el-option label="借支支出" value="9" />
             <el-option label="出借-支出" value="5" />
-            <el-option label="借贷-收入" value="6" />
+            <el-option label="借款-收入" value="6" />
             <el-option label="还款-支出" value="7" />
             <el-option label="还款进账-收入" value="8" />
           </el-select>
@@ -249,7 +249,7 @@
             <span v-if="scope.row.operateType == '4'">采购（报销）支出</span>
             <span v-if="scope.row.operateType == '9'">借支支出</span>
             <span v-if="scope.row.operateType == '5'">出借-支出</span>
-            <span v-if="scope.row.operateType == '6'">借贷-收入</span>
+            <span v-if="scope.row.operateType == '6'">借款-收入</span>
             <span v-if="scope.row.operateType == '7'">还款-支出</span>
             <span v-if="scope.row.operateType == '8'">还款进账-收入</span>
           </template>

precision-effect-web/src/views/for/index.vue

@@ -592,10 +592,7 @@ export default {
       fileList: [],
     };
   },
-  listRemove(e) {
-    this.fileList = [];
-    this.form.attachmentUrl = "";
-  },
+
   created() {
     this.getTreeselect();
     this.getList();
@@ -610,6 +607,10 @@ export default {
     },
   },
   methods: {
+    listRemove(e) {
+      this.fileList = [];
+      this.form.attachmentUrl = "";
+    },
     getFileInfo(res) {
       this.form.attachmentUrl = res.url;
       this.fileList = [
@@ -723,12 +724,12 @@ export default {
         this.title = "详情信息";
       });
       this.form.attachmentUrl = this.form.attachmentUrl;
-      this.fileList = [
-        {
-          name: res.fileName,
-          url: uploadfile,
-        },
-      ];
+      // this.fileList = [
+      //   {
+      //     name: res.fileName,
+      //     url: uploadfile,
+      //   },
+      // ];
 
 
       treeselect().then((response) => {

precision-effect-web/src/views/system/notice/index.vue

@@ -35,41 +35,41 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:notice:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:notice:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:notice:remove']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:notice:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:notice:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:notice:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -79,31 +79,36 @@
         align="center"
         prop="noticeTitle"
         :show-overflow-tooltip="true"
+
       />
       <el-table-column
         label="公告内容"
         align="center"
         prop="noticeContent"
-        :show-overflow-tooltip="true"
-      />
+      >
+        <template slot-scope="scope">
+          <span>{{scope.row.noticeContent}}</span>
+          <span v-if="scope.row.noticeContent == null">-</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="公告类型"
         align="center"
         prop="noticeType"
         :formatter="typeFormat"
-        width="100"
-      />
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="status"
-        :formatter="statusFormat"
-        width="100"
       />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status == 0">未读</span>
+          <span v-if="scope.row.status == 1">已读</span>
+          <span v-if="scope.row.status == null">-</span>
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="创建者" align="center" prop="createBy" width="100" />-->
-      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+      <el-table-column label="创建时间" align="center" prop="createTime" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{scope.row.createTime}}</span>
+          <span v-if="scope.row.createTime == null">-</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->