修改仓储费计算版面排序

src/views/morePage/stock/index.vue

@@ -172,7 +172,7 @@
       >
 
       <div class="tabSetting">
-        <div style="margin-right: 20px">
+<!--        <div style="margin-right: 20px">-->
 <!--          <el-button-->
 <!--            type="cyan"-->
 <!--            icon="el-icon-search"-->
@@ -180,9 +180,9 @@
 <!--            @click="handleQuery()"-->
 <!--            >搜索</el-button-->
 <!--          >-->
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-          >
+<!--          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"-->
+<!--            >重置</el-button-->
+<!--          >-->
 <!--          <el-button-->
 <!--            v-show="show"-->
 <!--            @click="show = !show"-->
@@ -195,9 +195,8 @@
 <!--            @click="show = !show"-->
 <!--            icon="el-icon-arrow-down"-->
 <!--            size="mini"-->
-<!--            >展开</el-button-->
-<!--          >-->
-        </div>
+<!--            >展开</el-button>-->
+<!--        </div>-->
 <!--        <right-toolbar-->
 <!--          :showSearch.sync="showSearch"-->
 <!--          @queryTable="getList"-->
@@ -291,6 +290,7 @@
           <span v-if="item.label == 'refno3'">{{
             scope.row.refno3 ? scope.row.refno3 : scope.row.billNo
           }}</span>
+          <span v-else-if="item.label == 'auditOpTime'">{{ scope.row.auditOpTime?(scope.row.auditOpTime).slice(0, 10): '' }}</span>
           <span v-else>{{ scope.row[item.label] }}</span>
         </template>
       </el-table-column>
@@ -414,6 +414,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         refno1: null,
+        refno3: null,
         rbillId: null,
         billNo: null,
         sendUserId: null,
@@ -604,14 +605,26 @@ export default {
       } else {
         this.queryParams.auditStatus = null
       }
-      console.log(audit)
-      console.log(this.queryParams.auditStatus)
       this.queryParams.pageNum = 1;
       this.getList(this.queryParams);
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        refno1: null,
+        refno3: null,
+        rbillId: null,
+        billNo: null,
+        sendUserId: null,
+        auditUserId: null,
+        actId: null,
+        sendTime: null,
+        billTime: null,
+        auditOpTime: null,
+      }
       this.handleQuery();
     },
     getList() {
@@ -623,6 +636,10 @@ export default {
           }
           if (e.refno2) {
             switch (e.refno2) {
+              case "FYBG": {
+                e.refno2 = "费用变更";
+                break;
+              }
               case "SJRK": {
                 e.refno2 = "入库";
                 break;
@@ -724,6 +741,13 @@ export default {
     },
     approval(row) {
       switch (row.refno4) {
+        case "FYBG": {
+          this.$router.push({
+            path: "/business/costModify",
+            query: { id: row.billId }
+          });
+          break;
+        }
         case "SJRK": {
           this.$router.push({
             path: "/business/inStock",

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -400,6 +400,7 @@
               <el-select
                   v-model="form.fCorpid"
                   filterable
+                  clearable
                   remote
                   :disabled="browseStatus"
                   style="width:80%"
@@ -423,6 +424,7 @@
                   style="width:80%"
                   :disabled="browseStatus"
                   remote
+                  clearable
                   :remote-method="goodsRemoteMethod"
                   placeholder="请输入模糊查找货品名称"
               >
@@ -440,6 +442,7 @@
               <el-input
                   v-model="form.fMblno"
                   style="width:80%"
+                  clearable
                   :disabled="browseStatus"
                   placeholder="手工输入"
               />
@@ -471,6 +474,16 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="制单人" prop="createBy">
+              <el-input
+                disabled
+                v-model="form.createBy"
+                style="width:80%"
+                placeholder="制单人"
+              />
+            </el-form-item>
+          </el-col>
           <!--          <el-col :span="8">-->
           <!--            <el-form-item label="仓储费方式" prop="fChargetype">-->
           <!--              <span>-->
@@ -494,18 +507,6 @@
           </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="制单人" prop="createBy">
-              <el-input
-                  disabled
-                  v-model="form.createBy"
-                  style="width:80%"
-                  placeholder="制单人"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
             <el-form-item disabled label="制单日期" prop="fbilldate">
               <el-date-picker
                   v-model="form.createTime"
@@ -519,6 +520,24 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8" v-if="showWarehouse == '0'">
+            <el-form-item label="仓库" prop="fWarehouseid">
+              <el-select v-model="form.fWarehouseid"
+                         :disabled="notChange"
+                         placeholder="请选择仓库库区"
+                         clearable
+                         filterable
+              >
+                <el-option
+                  v-for="(item, index) in warehouseOptions"
+                  :key="index.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+                  style="width: 210px;"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item disabled label="备注" prop="remark">
               <el-input
@@ -718,17 +737,33 @@
               width="150px"
               align="center"
               label="备注"
+              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="备注"
-                  :disabled="browseStatus"
+                  v-if="!browseStatus"
                   show-word-limit
               />
+              <span v-else>{{scope.row.remark}}</span>
             </template>
           </el-table-column>
           <el-table-column
+            prop="priceDateRemarks"
+            header-align="center"
+            width="150px"
+            align="center"
+            label="计费日期"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
               header-align="center"
               align="center"
               label="操作"
@@ -1042,6 +1077,22 @@
         >请 核
         </el-button>
       </div>
+
+<!--      内置备注显示-->
+      <el-dialog
+        append-to-body
+        width="30%"
+        title="备注"
+        :visible.sync="innerVisible"
+      >
+        <div>
+          <span><b>备注</b>：{{ showDetail.remark }}</span>
+        </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>
+      </el-dialog>
     </el-dialog>
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
@@ -1077,6 +1128,9 @@ import UploadFile from '@/components/Uploadfile'
 import draggable from "vuedraggable";
 import Cookies from 'js-cookie'
 import {addSet, select} from '@/api/system/set'
+import {
+  listWarehousesss,
+} from "@/api/basicdata/warehouse";
 
 Vue.directive('dialogDrag', {
   bind(el, binding, vnode, oldVnode) {
@@ -1143,6 +1197,13 @@ export default {
   },
   data() {
     return {
+      // 仓库
+      warehouseOptions: [],
+      innerVisible:false,
+      showDetail: {
+        remark: '',
+        priceDateRemarks: '',
+      },
       showWarehouse: null,
       tableHeight: '600',
       dialogFull: false,
@@ -1444,6 +1505,9 @@ export default {
       this.showWarehouse = response.msg;
     });
     this.register()
+    listWarehousesss({fStatus: 0, delFlag: 0}).then((response) => {
+      this.warehouseOptions = response.rows;
+    });
   },
   activated() {
     this.Jump()
@@ -2227,7 +2291,12 @@ export default {
           })
         }
       });
-    }
+    },
+    showRemarkDetail(row) {
+      this.showDetail.remark = row.remark
+      this.showDetail.priceDateRemarks = row.priceDateRemarks
+      this.innerVisible = true;
+    },
   }
 };
 </script>