添加“货权转移”字段

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -585,6 +585,7 @@
               <span v-if="scope.row.fBilltype === 'SJRK'">入库</span>
               <span v-if="scope.row.fBilltype === 'SJCK'">出库</span>
               <span v-if="scope.row.fBilltype === 'KCZZ'">库存总账</span>
+              <span v-if="scope.row.fBilltype === 'HQZY'">货权转移</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -740,12 +741,6 @@
               show-overflow-tooltip
           >
             <template slot-scope="scope">
-<!--              <el-button-->
-<!--                type="text"-->
-<!--                @click="showRemarkDetail(scope.row)"-->
-<!--              >-->
-<!--                详情-->
-<!--              </el-button>-->
               <el-input
                   v-model="scope.row.remark"
                   placeholder="备注"
@@ -762,7 +757,11 @@
             align="center"
             label="计费日期"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <span @click="showRemarkDetail(scope.row)">{{scope.row.priceDateRemarks}}</span>
+            </template>
+          </el-table-column>
           <el-table-column
               header-align="center"
               align="center"
@@ -1082,13 +1081,12 @@
       <el-dialog
         append-to-body
         width="30%"
-        title="备注"
+        title="计费日期详情"
         :visible.sync="innerVisible"
       >
-        <div>
-          <span><b>备注</b>：{{ showDetail.remark }}</span>
+        <div style="margin-top: 5px">
+          <p v-for="(item, index) in showDetail.priceDateRemarks" :key="index">{{ item }}</p>
         </div>
-        <div style="margin-top: 5px"><b>日期：</b>{{ showDetail.priceDateRemarks }}</div>
         <div slot="footer" class="dialog-footer">
           <el-button @click="innerVisible = false">关 闭</el-button>
         </div>
@@ -1201,8 +1199,7 @@ export default {
       warehouseOptions: [],
       innerVisible:false,
       showDetail: {
-        remark: '',
-        priceDateRemarks: '',
+        priceDateRemarks: [],
       },
       showWarehouse: null,
       tableHeight: '600',
@@ -2293,8 +2290,8 @@ export default {
       });
     },
     showRemarkDetail(row) {
-      this.showDetail.remark = row.remark
-      this.showDetail.priceDateRemarks = row.priceDateRemarks
+      let data = row.priceDateRemarks.split('，');
+      this.showDetail.priceDateRemarks = data
       this.innerVisible = true;
     },
   }