Browse Source

1. 优化

MONSTER-ygh 5 tháng trước cách đây
mục cha
commit
9cdce5e0c6

+ 4 - 8
src/views/order/groupBuyingMr/index.vue

@@ -383,7 +383,7 @@
                 <i class="el-icon-plus"></i>
               </el-upload>
           </el-form-item> -->
-          <el-form-item v-if="form.payOrCredit == 2 && !form.eaitType" label="账期" prop="rePaymentTime">
+          <el-form-item v-if="form.payOrCredit == 2" label="账期" prop="rePaymentTime">
             <el-date-picker
               v-model="form.rePaymentTime"
               type="date"
@@ -391,9 +391,6 @@
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item v-if="form.payOrCredit == 2 && form.eaitType" label="账期" prop="rePaymentTime">
-            <span>{{ moment(form.rePaymentTime).format("yyyy-MM-DD") }}</span>
-          </el-form-item>
           <el-form-item :label="form.payOrCredit != 2?'凭证上传':'挂账类型凭证'" prop="photoList">
             <div style="display: flex;flex-wrap: wrap;">
               <div 
@@ -405,13 +402,13 @@
                   :src="item" 
                   :preview-src-list="form.photoList">
                 </el-image>
-                <span v-if="!form.eaitType" @click="handleRemove(index)" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
+                <span @click="handleRemove(index)" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
                   <i class="el-icon-error"></i>
                 </span>
               </div>
               <div 
               style="width: 100px; height: 100px;margin-top: 5px;" 
-              v-if="!form.photoList||form.photoList.length<15 && !form.eaitType"
+              v-if="!form.photoList||form.photoList.length<15"
               v-loading="actionUrlLoading"
               element-loading-text="上传中..."
               element-loading-spinner="el-icon-loading"
@@ -435,8 +432,7 @@
             </div>
           </el-form-item>
           <el-form-item label="备注">
-            <el-input v-if="!form.eaitType" placeholder="请备注" type="textarea" maxlength="300" show-word-limit v-model="form.corporate.remark"></el-input>
-            <span v-if="form.eaitType">{{ form.corporate.remark }}</span>  
+            <el-input placeholder="请备注" type="textarea" maxlength="300" show-word-limit v-model="form.corporate.remark"></el-input>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">

+ 22 - 1
src/views/team/accountDetails/index.vue

@@ -25,6 +25,21 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="类型">
+          <el-select
+            v-model="queryParams.balanceType"
+            placeholder="类型"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="dict in dict.type.balance_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -38,6 +53,11 @@
       <el-table ref="tables" v-loading="loading" :data="dataList" border>
         <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
         <el-table-column label="团队名称" align="center" prop="teamName" />
+        <el-table-column label="类型" align="center" prop="type">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.balance_type" :value="scope.row.balanceType"/>
+          </template>
+        </el-table-column>
         <el-table-column label="变动类型" align="center" prop="type">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.accountDetails_type" :value="scope.row.type"/>
@@ -75,7 +95,7 @@
 
   export default {
     name: "agreement",
-    dicts: ['accountDetails_type'],
+    dicts: ['accountDetails_type','balance_type'],
     components: { ElImageViewer },
     data() {
       return {
@@ -153,6 +173,7 @@
         this.dateRange = [];
         this.$set(this.queryParams, 'teamName', '');
         this.$set(this.queryParams, 'type', '');
+        this.$set(this.queryParams, 'balanceType', '');
         this.queryParams.pageNum = 1;
         this.handleQuery();
       },