修改bug

src/api/warehouseBusiness/warehouseOutStock.js

@@ -69,7 +69,14 @@ export function addWarehousebills(data) {
     data: data
   })
 }
-
+// 库存预警(出入库)
+export function stockWarning(data) {
+  return request({
+    url: '/warehouseBusiness/outStock/stockWarning',
+    method: 'post',
+    data: data
+  })
+}
 // 修改仓库主(出入库)
 export function updateWarehousebills(data) {
   return request({

src/views/Warehousing/goodsTransfer/index.vue

@@ -1,77 +1,36 @@
 <template>
   <div class="app-container">
     <div v-show="pageShow">
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        v-show="showSearch"
-        label-width="70px"
-        size="small"
-      >
+      <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="70px" size="small">
         <el-row>
           <el-col :span="6">
             <el-form-item label="客户" prop="fCorpid">
-              <el-select
-                v-model="queryParams.fCorpid"
-                clearable
-                filterable
-                placeholder="请输入关键词"
-                style="width: 200px"
-              >
-                <el-option
-                  v-for="(item, index) in fMblnoOptions"
-                  :key="index.fId"
-                  :label="item.fName"
-                  :value="item.fId"
-                ></el-option>
+              <el-select v-model="queryParams.fCorpid" clearable filterable placeholder="请输入关键词" style="width: 200px">
+                <el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName"
+                  :value="item.fId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="提单号" prop="fMblno">
-              <el-input
-                v-model="queryParams.fMblno"
-                placeholder="请输入提单号"
-                clearable
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              />
+              <el-input v-model="queryParams.fMblno" placeholder="请输入提单号" clearable style="width: 200px"
+                @keyup.enter.native="handleQuery" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="仓库" prop="fWarehouseid">
-              <el-select
-                v-model="queryParams.fWarehouseid"
-                clearable
-                filterable
-                placeholder="请选择仓库"
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              >
-                <el-option
-                  v-for="(item, index) in warehouseOptions"
-                  :key="index.fId"
-                  :label="item.fName"
-                  :value="item.fId"
-                ></el-option>
+              <el-select v-model="queryParams.fWarehouseid" clearable filterable placeholder="请选择仓库"
+                style="width: 200px" @keyup.enter.native="handleQuery">
+                <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
+                  :value="item.fId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="货转日期" prop="timeInterval">
-              <el-date-picker
-                v-model="queryParams.timeInterval"
-                type="daterange"
-                value-format="yyyy-MM-dd"
-                clearable
-                style="width: 230px"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                @keyup.enter.native="handleQuery"
-                :picker-options="pickerOptions"
-                unlink-panels
-              >
+              <el-date-picker v-model="queryParams.timeInterval" type="daterange" value-format="yyyy-MM-dd" clearable
+                style="width: 230px" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                @keyup.enter.native="handleQuery" :picker-options="pickerOptions" unlink-panels>
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -81,41 +40,22 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="货物名称" prop="fGoodsid">
-                  <el-select
-                    v-model="queryParams.fGoodsid"
-                    clearable
-                    filterable
-                    placeholder="请选择货物名称"
-                    style="width: 200px"
-                    @keyup.enter.native="handleQuery"
-                  >
-                    <el-option
-                      v-for="(item, index) in goodsOptions"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
-                    ></el-option>
+                  <el-select v-model="queryParams.fGoodsid" clearable filterable placeholder="请选择货物名称"
+                    style="width: 200px" @keyup.enter.native="handleQuery">
+                    <el-option v-for="(item, index) in goodsOptions" :key="index.fId" :label="item.fName"
+                      :value="item.fId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="品牌" prop="fMarks">
-                  <el-input
-                    v-model="queryParams.fMarks"
-                    placeholder="请输入品牌"
-                    clearable
-                    style="width: 200px"
-                    @keyup.enter.native="handleQuery"
-                  />
+                  <el-input v-model="queryParams.fMarks" placeholder="请输入品牌" clearable style="width: 200px"
+                    @keyup.enter.native="handleQuery" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="货转状态" prop="fItemsStatus">
-                  <el-select
-                    style="width: 200px"
-                    v-model="queryParams.fItemsStatus"
-                    placeholder="请选择货转状态"
-                  >
+                  <el-select style="width: 200px" v-model="queryParams.fItemsStatus" placeholder="请选择货转状态">
                     <el-option label="计划" value="1" />
                     <el-option label="待货转" value="2" />
                     <el-option label="已货转" value="6" />
@@ -124,11 +64,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="费用状态" prop="fFeeStatus">
-                  <el-select
-                    style="width: 200px"
-                    v-model="queryParams.fFeeStatus"
-                    placeholder="请选择费用状态"
-                  >
+                  <el-select style="width: 200px" v-model="queryParams.fFeeStatus" placeholder="请选择费用状态">
                     <el-option label="暂存" :value="1"></el-option>
                     <el-option label="部分" :value="2"></el-option>
                     <el-option label="全部入账" :value="3"></el-option>
@@ -139,67 +75,34 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="业务编号" prop="fBillno">
-                  <el-input
-                    v-model="queryParams.fBillno"
-                    placeholder="请输入业务编号"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                    style="width: 200px"
-                  />
+                  <el-input v-model="queryParams.fBillno" placeholder="请输入业务编号" clearable
+                    @keyup.enter.native="handleQuery" style="width: 200px" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="制单人" prop="createBy">
-                  <el-select
-                    v-model="queryParams.createBy"
-                    filterable
-                    clearable
-                    placeholder="请输入关键词"
-                    style="width: 200px"
-                  >
-                    <el-option
-                      v-for="(item, index) in userOptions"
-                      :key="index.userName"
-                      :label="item.nickName"
-                      :value="item.userName"
-                    >
+                  <el-select v-model="queryParams.createBy" filterable clearable placeholder="请输入关键词"
+                    style="width: 200px">
+                    <el-option v-for="(item, index) in userOptions" :key="index.userName" :label="item.nickName"
+                      :value="item.userName">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="经营单位" prop="fSbu">
-                  <el-select
-                    v-model="queryParams.fSbu"
-                    clearable
-                    filterable
-                    placeholder="请输入关键词"
-                    style="width: 200px"
-                  >
-                    <el-option
-                      v-for="(item, index) in fMblnoOptions"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
-                    ></el-option>
+                  <el-select v-model="queryParams.fSbu" clearable filterable placeholder="请输入关键词" style="width: 200px">
+                    <el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName"
+                      :value="item.fId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="贸易方式" prop="fTrademodeid">
-                  <el-select
-                    v-model="queryParams.fTrademodeid"
-                    placeholder="请选择贸易方式"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                    style="width: 200px"
-                  >
-                    <el-option
-                      v-for="(item, index) in fTrademodeidOptions"
-                      :key="index.dictValue"
-                      :label="item.dictLabel"
-                      :value="item.dictValue"
-                    />
+                  <el-select v-model="queryParams.fTrademodeid" placeholder="请选择贸易方式" clearable
+                    @keyup.enter.native="handleQuery" style="width: 200px">
+                    <el-option v-for="(item, index) in fTrademodeidOptions" :key="index.dictValue"
+                      :label="item.dictLabel" :value="item.dictValue" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -209,152 +112,71 @@
       </el-form>
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['warehouseBusiness:stockTransfer:add']"
-            >新增
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+            v-hasPermi="['warehouseBusiness:stockTransfer:add']">新增
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="success"
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
-            >修改
+          <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['warehouseBusiness:stockTransfer:edit']">修改
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['warehouseBusiness:stockTransfer:export']"
-            >导出
+          <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
+            v-hasPermi="['warehouseBusiness:stockTransfer:export']">导出
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="info"
-            icon="el-icon-download"
-            size="mini"
-            :disabled="single"
-            @click="copyUpdate"
-            v-hasPermi="['agreement:agreementStorage:export']"
-            >复制新增
+          <el-button type="info" icon="el-icon-download" size="mini" :disabled="single" @click="copyUpdate"
+            v-hasPermi="['agreement:agreementStorage:export']">复制新增
           </el-button>
         </el-col>
         <div class="tabSetting">
           <div style="margin-right: 20px">
-            <el-button
-              type="cyan"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleQuery"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            >
-            <el-button
-              v-show="show"
-              @click="show = !show"
-              icon="el-icon-arrow-up"
-              size="mini"
-              >展开</el-button
-            >
-            <el-button
-              v-show="!show"
-              @click="show = !show"
-              icon="el-icon-arrow-down"
-              size="mini"
-              >展开</el-button
-            >
+            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button v-show="show" @click="show = !show" icon="el-icon-arrow-up" size="mini">展开</el-button>
+            <el-button v-show="!show" @click="show = !show" icon="el-icon-arrow-down" size="mini">展开</el-button>
           </div>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           <div style="margin: 0 12px">
-            <el-button
-              icon="el-icon-setting"
-              size="mini"
-              circle
-              @click="showSetting = !showSetting"
-            ></el-button>
+            <el-button icon="el-icon-setting" size="mini" circle @click="showSetting = !showSetting"></el-button>
           </div>
         </div>
       </el-row>
-      <el-dialog
-        title="自定义列显示"
-        :visible.sync="showSetting"
-        width="700px"
-        v-dialogDrag
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" v-dialogDrag :close-on-click-modal="false">
         <template slot="title">
           <div class="avue-crud__dialog__header">
             <span class="el-dialog__title">
-              <span
-                style="
+              <span style="
                   display: inline-block;
                   width: 3px;
                   height: 20px;
                   margin-right: 5px;
                   float: left;
                   margin-top: 2px;
-                "
-              ></span>
+                "></span>
             </span>
           </div>
         </template>
         <div>配置排序列数据（拖动调整顺序）</div>
         <div style="margin-left: 17px">
-          <el-checkbox
-            v-model="allCheck"
-            label="全选"
-            @change="allChecked"
-          ></el-checkbox>
+          <el-checkbox v-model="allCheck" label="全选" @change="allChecked"></el-checkbox>
         </div>
         <div style="padding: 4px; display: flex; justify-content: center">
-          <draggable
-            v-model="setRowList"
-            group="site"
-            animation="300"
-            @start="onStart"
-            @end="onEnd"
-            handle=".indraggable"
-          >
+          <draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd"
+            handle=".indraggable">
             <transition-group>
-              <div
-                v-for="item in setRowList"
-                :key="item.surface"
-                class="listStyle"
-              >
+              <div v-for="item in setRowList" :key="item.surface" class="listStyle">
                 <div style="width: 500px" class="indraggable">
                   <div class="progress" :style="{ width: item.width + 'px' }">
-                    <el-checkbox
-                      :label="item.name"
-                      v-model="item.checked"
-                      :true-label="0"
-                      :false-label="1"
-                      >{{ item.name }}
+                    <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{ item.name
+                    }}
                     </el-checkbox>
                   </div>
                 </div>
-                <el-input-number
-                  v-model.number="item.width"
-                  controls-position="right"
-                  :min="1"
-                  :max="500"
-                  size="mini"
-                ></el-input-number>
+                <el-input-number v-model.number="item.width" controls-position="right" :min="1" :max="500" size="mini">
+                </el-input-number>
               </div>
             </transition-group>
           </draggable>
@@ -366,113 +188,51 @@
         </span>
       </el-dialog>
 
-      <el-table
-        v-loading="loading"
-        :data="warehousebillsList"
-        @selection-change="handleSelectionChange"
-        show-summary
-        :summary-method="getSum"
-        ref="table"
-        :height="tableHeight"
-      >
+      <el-table v-loading="loading" :data="warehousebillsList" @selection-change="handleSelectionChange" show-summary
+        :summary-method="getSum" ref="table" :height="tableHeight">
         <el-table-column type="selection" width="60" fixed align="center" />
-        <el-table-column
-          type="index"
-          label="行号"
-          width="50"
-          align="center"
-          fixed
-        />
-        <el-table-column
-          v-for="(item, index) in getRowList"
-          :key="index"
-          :label="item.name"
-          :width="item.width"
-          :prop="item.label"
-          align="center"
-          :fixed="item.fixed"
-          :show-overflow-tooltip="true"
-          sortable
-        >
+        <el-table-column type="index" label="行号" width="50" align="center" fixed />
+        <el-table-column v-for="(item, index) in getRowList" :key="index" :label="item.name" :width="item.width"
+          :prop="item.label" align="center" :fixed="item.fixed" :show-overflow-tooltip="true" sortable>
           <template slot-scope="scope">
             <span v-if="item.label == 'fMblno'">
-              <el-link :underline="false" type="primary"
-                ><div @click="handleUpdate(scope.row)">
+              <el-link :underline="false" type="primary">
+                <div @click="handleUpdate(scope.row)">
                   {{ scope.row.fMblno }}
-                </div></el-link
-              >
+                </div>
+              </el-link>
             </span>
             <span v-else>{{ scope.row[item.label] }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-          min-width="200"
-          fixed="right"
-        >
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="200" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row, true)"
-              v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
-              >查看
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
+              v-hasPermi="['warehouseBusiness:stockTransfer:edit']">查看
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              v-if="
-                scope.row.fBillstatus == '录入' ||
-                scope.row.fBillstatus == '暂存' ||
-                scope.row.fBillstatus == '驳回'
-              "
-              @click="handleUpdate(scope.row, false)"
-              v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
-              >修改
+            <el-button size="mini" type="text" icon="el-icon-edit" v-if="
+              scope.row.fBillstatus == '录入' ||
+              scope.row.fBillstatus == '暂存' ||
+              scope.row.fBillstatus == '驳回'
+            " @click="handleUpdate(scope.row, false)" v-hasPermi="['warehouseBusiness:stockTransfer:edit']">修改
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
+            <el-button size="mini" type="text" icon="el-icon-delete"
               v-if="(scope.row.fItemsStatus == '待货转' || scope.row.fItemsStatus == '计划') && scope.row.isCreate == 1 || (scope.row.fItemsStatus == '待货转' || scope.row.fItemsStatus == '计划') && scope.row.isCreate == 0"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['warehouseBusiness:stockTransfer:remove']"
-              >删除
+              @click="handleDelete(scope.row)" v-hasPermi="['warehouseBusiness:stockTransfer:remove']">删除
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              v-if="
-                scope.row.fBillstatus == '请核' ||
-                scope.row.fBillstatus == '审核中'
-              "
-              @click="handleUpdate(scope.row, true)"
-              >审核进度
+            <el-button size="mini" type="text" icon="el-icon-delete" v-if="
+              scope.row.fBillstatus == '请核' ||
+              scope.row.fBillstatus == '审核中'
+            " @click="handleUpdate(scope.row, true)">审核进度
             </el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
     </div>
-    <add-or-update
-      v-show="pageShow2"
-      @changeShow="showAddOrUpdate"
-      ref="addOrUpdateRef"
-      :chiId="formId"
-      :copyStatus="copyStatus"
-      :key="timer"
-    ></add-or-update>
+    <add-or-update v-show="pageShow2" @changeShow="showAddOrUpdate" ref="addOrUpdateRef" :chiId="formId"
+      :copyStatus="copyStatus" :key="timer"></add-or-update>
   </div>
 </template>
 
@@ -682,6 +442,28 @@ export default {
           checked: 0,
           width: 100,
         },
+
+        {
+          surface: "19",
+          label: "fApplyMoney",
+          name: "开票金额",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "20",
+          label: "invoiceNo",
+          name: "发票号",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "21",
+          label: "fAccbilldate",
+          name: "开票时间",
+          checked: 0,
+          width: 130,
+        },
       ],
       setRowList: [],
       getRowList: [],
@@ -796,7 +578,7 @@ export default {
       let currentMonth = date.getMonth()
       let nextMonth = ++currentMonth
       let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-      let oneDay = 1000*60*60*24
+      let oneDay = 1000 * 60 * 60 * 24
       let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
       let day = lastTime.getDate()
       if (day < 10) {

src/views/Warehousing/outStock/index.vue

@@ -753,8 +753,29 @@ export default {
           checked: 0,
           width: 100,
         },
-        {
+                {
           surface: "26",
+          label: "fApplyMoney",
+          name: "开票金额",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "27",
+          label: "invoiceNo",
+          name: "发票号",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "28",
+          label: "fAccbilldate",
+          name: "开票时间",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "29",
           label: "remark",
           name: "备注",
           checked: 0,

src/views/Warehousing/stockTransfer/index.vue

@@ -1,77 +1,36 @@
 <template>
   <div class="app-container">
     <div v-show="pageShow">
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        v-show="showSearch"
-        label-width="70px"
-        size="small"
-      >
+      <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="70px" size="small">
         <el-row>
           <el-col :span="6">
             <el-form-item label="客户" prop="fCorpid">
-              <el-select
-                v-model="queryParams.fCorpid"
-                clearable
-                filterable
-                placeholder="请输入关键词"
-                style="width: 200px"
-              >
-                <el-option
-                  v-for="(item, index) in fMblnoOptions"
-                  :key="index.fId"
-                  :label="item.fName"
-                  :value="item.fId"
-                ></el-option>
+              <el-select v-model="queryParams.fCorpid" clearable filterable placeholder="请输入关键词" style="width: 200px">
+                <el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName"
+                  :value="item.fId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="提单号" prop="fMblno">
-              <el-input
-                v-model="queryParams.fMblno"
-                placeholder="请输入提单号"
-                clearable
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              />
+              <el-input v-model="queryParams.fMblno" placeholder="请输入提单号" clearable style="width: 200px"
+                @keyup.enter.native="handleQuery" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="仓库" prop="fWarehouseid">
-              <el-select
-                v-model="queryParams.fWarehouseid"
-                clearable
-                filterable
-                placeholder="请选择仓库"
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              >
-                <el-option
-                  v-for="(item, index) in warehouseOptions"
-                  :key="index.fId"
-                  :label="item.fName"
-                  :value="item.fId"
-                ></el-option>
+              <el-select v-model="queryParams.fWarehouseid" clearable filterable placeholder="请选择仓库"
+                style="width: 200px" @keyup.enter.native="handleQuery">
+                <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
+                  :value="item.fId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="调拨日期" prop="timeInterval">
-              <el-date-picker
-                v-model="queryParams.timeInterval"
-                type="daterange"
-                value-format="yyyy-MM-dd"
-                clearable
-                style="width: 230px"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                @keyup.enter.native="handleQuery"
-                :picker-options="pickerOptions"
-                unlink-panels
-              >
+              <el-date-picker v-model="queryParams.timeInterval" type="daterange" value-format="yyyy-MM-dd" clearable
+                style="width: 230px" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                @keyup.enter.native="handleQuery" :picker-options="pickerOptions" unlink-panels>
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -81,41 +40,22 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="货物名称" prop="fGoodsid">
-                  <el-select
-                    v-model="queryParams.fGoodsid"
-                    clearable
-                    filterable
-                    placeholder="请选择货物名称"
-                    style="width: 200px"
-                    @keyup.enter.native="handleQuery"
-                  >
-                    <el-option
-                      v-for="(item, index) in goodsOptions"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
-                    ></el-option>
+                  <el-select v-model="queryParams.fGoodsid" clearable filterable placeholder="请选择货物名称"
+                    style="width: 200px" @keyup.enter.native="handleQuery">
+                    <el-option v-for="(item, index) in goodsOptions" :key="index.fId" :label="item.fName"
+                      :value="item.fId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="品牌" prop="fMarks">
-                  <el-input
-                    v-model="queryParams.fMarks"
-                    placeholder="请输入品牌"
-                    clearable
-                    style="width: 200px"
-                    @keyup.enter.native="handleQuery"
-                  />
+                  <el-input v-model="queryParams.fMarks" placeholder="请输入品牌" clearable style="width: 200px"
+                    @keyup.enter.native="handleQuery" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="调拨状态" prop="fItemsStatus">
-                  <el-select
-                    style="width: 200px"
-                    v-model="queryParams.fItemsStatus"
-                    placeholder="请选择调拨状态"
-                  >
+                  <el-select style="width: 200px" v-model="queryParams.fItemsStatus" placeholder="请选择调拨状态">
                     <el-option label="计划" value="1" />
                     <el-option label="待调拨" value="2" />
                     <el-option label="调拨中" value="3" />
@@ -125,11 +65,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="费用状态" prop="fFeeStatus">
-                  <el-select
-                    style="width: 200px"
-                    v-model="queryParams.fFeeStatus"
-                    placeholder="请选择费用状态"
-                  >
+                  <el-select style="width: 200px" v-model="queryParams.fFeeStatus" placeholder="请选择费用状态">
                     <el-option label="暂存" :value="1"></el-option>
                     <el-option label="部分" :value="2"></el-option>
                     <el-option label="全部入账" :value="3"></el-option>
@@ -140,67 +76,34 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="业务编号" prop="fBillno">
-                  <el-input
-                    v-model="queryParams.fBillno"
-                    placeholder="请输入业务编号"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                    style="width: 200px"
-                  />
+                  <el-input v-model="queryParams.fBillno" placeholder="请输入业务编号" clearable
+                    @keyup.enter.native="handleQuery" style="width: 200px" />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="制单人" prop="createBy">
-                  <el-select
-                    v-model="queryParams.createBy"
-                    filterable
-                    clearable
-                    placeholder="请输入关键词"
-                    style="width: 200px"
-                  >
-                    <el-option
-                      v-for="(item, index) in userOptions"
-                      :key="index.userName"
-                      :label="item.nickName"
-                      :value="item.userName"
-                    >
+                  <el-select v-model="queryParams.createBy" filterable clearable placeholder="请输入关键词"
+                    style="width: 200px">
+                    <el-option v-for="(item, index) in userOptions" :key="index.userName" :label="item.nickName"
+                      :value="item.userName">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="经营单位" prop="fSbu">
-                  <el-select
-                    v-model="queryParams.fSbu"
-                    clearable
-                    filterable
-                    placeholder="请输入关键词"
-                    style="width: 200px"
-                  >
-                    <el-option
-                      v-for="(item, index) in fMblnoOptions"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
-                    ></el-option>
+                  <el-select v-model="queryParams.fSbu" clearable filterable placeholder="请输入关键词" style="width: 200px">
+                    <el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName"
+                      :value="item.fId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="贸易方式" prop="fTrademodeid">
-                  <el-select
-                    v-model="queryParams.fTrademodeid"
-                    placeholder="请选择贸易方式"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                    style="width: 200px"
-                  >
-                    <el-option
-                      v-for="(item, index) in fTrademodeidOptions"
-                      :key="index.dictValue"
-                      :label="item.dictLabel"
-                      :value="item.dictValue"
-                    />
+                  <el-select v-model="queryParams.fTrademodeid" placeholder="请选择贸易方式" clearable
+                    @keyup.enter.native="handleQuery" style="width: 200px">
+                    <el-option v-for="(item, index) in fTrademodeidOptions" :key="index.dictValue"
+                      :label="item.dictLabel" :value="item.dictValue" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -210,152 +113,71 @@
       </el-form>
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['warehouseBusiness:stockTransfer:add']"
-            >新增
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+            v-hasPermi="['warehouseBusiness:stockTransfer:add']">新增
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="success"
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
-            >修改
+          <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['warehouseBusiness:stockTransfer:edit']">修改
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="warning"
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['warehouseBusiness:stockTransfer:export']"
-            >导出
+          <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
+            v-hasPermi="['warehouseBusiness:stockTransfer:export']">导出
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="info"
-            icon="el-icon-download"
-            size="mini"
-            :disabled="single"
-            @click="copyUpdate"
-            v-hasPermi="['agreement:agreementStorage:export']"
-            >复制新增
+          <el-button type="info" icon="el-icon-download" size="mini" :disabled="single" @click="copyUpdate"
+            v-hasPermi="['agreement:agreementStorage:export']">复制新增
           </el-button>
         </el-col>
         <div class="tabSetting">
           <div style="margin-right: 20px">
-            <el-button
-              type="cyan"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleQuery"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            >
-            <el-button
-              v-show="show"
-              @click="show = !show"
-              icon="el-icon-arrow-up"
-              size="mini"
-              >展开</el-button
-            >
-            <el-button
-              v-show="!show"
-              @click="show = !show"
-              icon="el-icon-arrow-down"
-              size="mini"
-              >展开</el-button
-            >
+            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button v-show="show" @click="show = !show" icon="el-icon-arrow-up" size="mini">展开</el-button>
+            <el-button v-show="!show" @click="show = !show" icon="el-icon-arrow-down" size="mini">展开</el-button>
           </div>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           <div style="margin: 0 12px">
-            <el-button
-              icon="el-icon-setting"
-              size="mini"
-              circle
-              @click="showSetting = !showSetting"
-            ></el-button>
+            <el-button icon="el-icon-setting" size="mini" circle @click="showSetting = !showSetting"></el-button>
           </div>
         </div>
       </el-row>
-      <el-dialog
-        title="自定义列显示"
-        :visible.sync="showSetting"
-        width="700px"
-        v-dialogDrag
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" v-dialogDrag :close-on-click-modal="false">
         <template slot="title">
           <div class="avue-crud__dialog__header">
             <span class="el-dialog__title">
-              <span
-                style="
+              <span style="
                   display: inline-block;
                   width: 3px;
                   height: 20px;
                   margin-right: 5px;
                   float: left;
                   margin-top: 2px;
-                "
-              ></span>
+                "></span>
             </span>
           </div>
         </template>
         <div>配置排序列数据（拖动调整顺序）</div>
         <div style="margin-left: 17px">
-          <el-checkbox
-            v-model="allCheck"
-            label="全选"
-            @change="allChecked"
-          ></el-checkbox>
+          <el-checkbox v-model="allCheck" label="全选" @change="allChecked"></el-checkbox>
         </div>
         <div style="padding: 4px; display: flex; justify-content: center">
-          <draggable
-            v-model="setRowList"
-            group="site"
-            animation="300"
-            @start="onStart"
-            @end="onEnd"
-            handle=".indraggable"
-          >
+          <draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd"
+            handle=".indraggable">
             <transition-group>
-              <div
-                v-for="item in setRowList"
-                :key="item.surface"
-                class="listStyle"
-              >
+              <div v-for="item in setRowList" :key="item.surface" class="listStyle">
                 <div style="width: 500px" class="indraggable">
                   <div class="progress" :style="{ width: item.width + 'px' }">
-                    <el-checkbox
-                      :label="item.name"
-                      v-model="item.checked"
-                      :true-label="0"
-                      :false-label="1"
-                      >{{ item.name }}
+                    <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{ item.name
+                    }}
                     </el-checkbox>
                   </div>
                 </div>
-                <el-input-number
-                  v-model.number="item.width"
-                  controls-position="right"
-                  :min="1"
-                  :max="500"
-                  size="mini"
-                ></el-input-number>
+                <el-input-number v-model.number="item.width" controls-position="right" :min="1" :max="500" size="mini">
+                </el-input-number>
               </div>
             </transition-group>
           </draggable>
@@ -367,115 +189,53 @@
         </span>
       </el-dialog>
 
-      <el-table
-        v-loading="loading"
-        :data="warehousebillsList"
-        @selection-change="handleSelectionChange"
-        show-summary
-        :summary-method="getSum"
-        ref="table"
-        :height="tableHeight"
-      >
+      <el-table v-loading="loading" :data="warehousebillsList" @selection-change="handleSelectionChange" show-summary
+        :summary-method="getSum" ref="table" :height="tableHeight">
         <el-table-column type="selection" width="60" fixed align="center" />
-        <el-table-column
-          type="index"
-          label="行号"
-          width="50"
-          align="center"
-          fixed
-        />
-        <el-table-column
-          v-for="(item, index) in getRowList"
-          :key="index"
-          :label="item.name"
-          :width="item.width"
-          :prop="item.label"
-          align="center"
-          :fixed="item.fixed"
-          :show-overflow-tooltip="true"
-          sortable
-        >
+        <el-table-column type="index" label="行号" width="50" align="center" fixed />
+        <el-table-column v-for="(item, index) in getRowList" :key="index" :label="item.name" :width="item.width"
+          :prop="item.label" align="center" :fixed="item.fixed" :show-overflow-tooltip="true" sortable>
           <template slot-scope="scope">
             <span v-if="item.label == 'fMblno'">
-              <el-link :underline="false" type="primary"
-                ><div @click="handleUpdate(scope.row)">
+              <el-link :underline="false" type="primary">
+                <div @click="handleUpdate(scope.row)">
                   {{ scope.row.fMblno }}
-                </div></el-link
-              >
+                </div>
+              </el-link>
             </span>
             <span v-else>{{ scope.row[item.label] }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-          min-width="200"
-          fixed="right"
-        >
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="200" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row, true)"
-              v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
-              >查看
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
+              v-hasPermi="['warehouseBusiness:stockTransfer:edit']">查看
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              v-if="
-                scope.row.fBillstatus == '录入' ||
-                scope.row.fBillstatus == '暂存' ||
-                scope.row.fBillstatus == '驳回'
-              "
-              @click="handleUpdate(scope.row, false)"
-              v-hasPermi="['warehouseBusiness:stockTransfer:edit']"
-              >修改
+            <el-button size="mini" type="text" icon="el-icon-edit" v-if="
+              scope.row.fBillstatus == '录入' ||
+              scope.row.fBillstatus == '暂存' ||
+              scope.row.fBillstatus == '驳回'
+            " @click="handleUpdate(scope.row, false)" v-hasPermi="['warehouseBusiness:stockTransfer:edit']">修改
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
+            <el-button size="mini" type="text" icon="el-icon-delete"
               v-if="(scope.row.fItemsStatus == '待调拨' || scope.row.fItemsStatus == '计划') && scope.row.warehouseStatus < 4 && scope.row.isCreate == 1
               ||
               (scope.row.fItemsStatus == '待调拨' || scope.row.fItemsStatus == '计划') && scope.row.warehouseStatus < 4 && scope.row.isCreate == 0"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['warehouseBusiness:stockTransfer:remove']"
-              >删除
+              @click="handleDelete(scope.row)" v-hasPermi="['warehouseBusiness:stockTransfer:remove']">删除
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              v-if="
-                scope.row.fBillstatus == '请核' ||
-                scope.row.fBillstatus == '审核中'
-              "
-              @click="handleUpdate(scope.row, true)"
-              >审核进度
+            <el-button size="mini" type="text" icon="el-icon-delete" v-if="
+              scope.row.fBillstatus == '请核' ||
+              scope.row.fBillstatus == '审核中'
+            " @click="handleUpdate(scope.row, true)">审核进度
             </el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
     </div>
-    <add-or-update
-      v-show="pageShow2"
-      @changeShow="showAddOrUpdate"
-      ref="addOrUpdateRef"
-      :chiId="formId"
-      :copyStatus="copyStatus"
-      :key="timer"
-    ></add-or-update>
+    <add-or-update v-show="pageShow2" @changeShow="showAddOrUpdate" ref="addOrUpdateRef" :chiId="formId"
+      :copyStatus="copyStatus" :key="timer"></add-or-update>
   </div>
 </template>
 
@@ -700,6 +460,27 @@ export default {
         },
         {
           surface: "23",
+          label: "fApplyMoney",
+          name: "开票金额",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "24",
+          label: "invoiceNo",
+          name: "发票号",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "25",
+          label: "fAccbilldate",
+          name: "开票时间",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "26",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -819,7 +600,7 @@ export default {
       let currentMonth = date.getMonth()
       let nextMonth = ++currentMonth
       let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-      let oneDay = 1000*60*60*24
+      let oneDay = 1000 * 60 * 60 * 24
       let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
       let day = lastTime.getDate()
       if (day < 10) {
@@ -1094,7 +875,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
-        fFeeStatus:null,
+        fFeeStatus: null,
       };
       this.handleQuery();
     },

src/views/basicdata/goods/index.vue

@@ -1,178 +1,75 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="编号" prop="fNo">
-        <el-input
-          v-model="queryParams.fNo"
-          placeholder="请输入编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.fNo" placeholder="请输入编号" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="名称" prop="fName">
-        <el-input
-          v-model="queryParams.fName"
-          placeholder="请输入名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.fName" placeholder="请输入名称" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="英文名称" prop="fEnam">
-        <el-input
-          v-model="queryParams.fEnam"
-          placeholder="请输入英文名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.fEnam" placeholder="请输入英文名称" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="规格" prop="fSpecs">
-        <el-input
-          v-model="queryParams.fSpecs"
-          placeholder="请输入规格"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.fSpecs" placeholder="请输入规格" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="包装规格" prop="fPackagespecs">
-        <el-input
-          v-model="queryParams.fPackagespecs"
-          placeholder="请输入包装规格"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.fPackagespecs" placeholder="请输入包装规格" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="颜色" prop="fColor">
-        <el-input
-          v-model="queryParams.fColor"
-          placeholder="请输入颜色"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.fColor" placeholder="请输入颜色" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="海关编码" prop="fHscode">
-        <el-input
-          v-model="queryParams.fHscode"
-          placeholder="请输入海关编码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.fHscode" placeholder="请输入海关编码" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="包装类型" prop="fPackageid">
-        <el-input
-          v-model="queryParams.fPackageid"
-          placeholder="请输入包装类型"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.fPackageid" placeholder="请输入包装类型" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="fStatus">
         <!--<el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>-->
-        <el-select
-          v-model="queryParams.fStatus"
-          placeholder="商品状态"
-          clearable
-          size="small"
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
+        <el-select v-model="queryParams.fStatus" placeholder="商品状态" clearable size="small" style="width: 240px">
+          <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel"
+            :value="dict.dictValue" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['basicdata:goods:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['basicdata:goods:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['basicdata:goods:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['basicdata:goods:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['basicdata:goods:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['basicdata:goods:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['basicdata:goods:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['basicdata:goods:export']">导出</el-button>
       </el-col>
       <div class="tabSetting">
-        <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-        ></right-toolbar>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         <div style="margin: 0 12px">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="列设置"
-            placement="top"
-          >
-            <el-button
-              icon="el-icon-setting"
-              size="mini"
-              circle
-              @click="showSetting = !showSetting"
-            ></el-button>
+          <el-tooltip class="item" effect="dark" content="列设置" placement="top">
+            <el-button icon="el-icon-setting" size="mini" circle @click="showSetting = !showSetting"></el-button>
           </el-tooltip>
         </div>
       </div>
@@ -180,45 +77,22 @@
     <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
       <div>配置排序列数据（拖动调整顺序）</div>
       <div style="margin-left: 17px">
-        <el-checkbox
-          v-model="allCheck"
-          label="全选"
-          @change="allChecked"
-        ></el-checkbox>
+        <el-checkbox v-model="allCheck" label="全选" @change="allChecked"></el-checkbox>
       </div>
       <div style="padding: 4px; display: flex; justify-content: center">
-        <draggable
-          v-model="setRowList"
-          group="site"
-          animation="300"
-          @start="onStart"
-          @end="onEnd"
-          handle=".indraggable"
-        >
+        <draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd"
+          handle=".indraggable">
           <transition-group>
-            <div
-              v-for="item in setRowList"
-              :key="item.surface"
-              class="listStyle"
-            >
+            <div v-for="item in setRowList" :key="item.surface" class="listStyle">
               <div style="width: 500px" class="indraggable">
                 <div class="progress" :style="{ width: item.width + 'px' }">
-                  <el-checkbox
-                    :label="item.name"
-                    v-model="item.checked"
-                    :true-label="0"
-                    :false-label="1"
-                    >{{ item.name }}
+                  <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{ item.name
+                  }}
                   </el-checkbox>
                 </div>
               </div>
-              <el-input-number
-                v-model.number="item.width"
-                controls-position="right"
-                :min="1"
-                :max="500"
-                size="mini"
-              ></el-input-number>
+              <el-input-number v-model.number="item.width" controls-position="right" :min="1" :max="500" size="mini">
+              </el-input-number>
             </div>
           </transition-group>
         </draggable>
@@ -229,29 +103,17 @@
         <el-button type="primary" @click="save()">确 定</el-button>
       </span>
     </el-dialog>
-    <el-table
-      v-loading="loading"
-      :data="goodsList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center" />
-      <!--<el-table-column label="存储id" align="center" prop="fTypeid" />--><!-- 后期添加 -->
-      <el-table-column
-        v-for="(item, index) in getRowList"
-        :key="index"
-        :label="item.name"
-        :width="item.width"
-        :prop="item.label"
-        align="center"
-        :fixed="item.fixed"
-        :show-overflow-tooltip="true"
-        sortable
-      >
+      <!--<el-table-column label="存储id" align="center" prop="fTypeid" />-->
+      <!-- 后期添加 -->
+      <el-table-column v-for="(item, index) in getRowList" :key="index" :label="item.name" :width="item.width"
+        :prop="item.label" align="center" :fixed="item.fixed" :show-overflow-tooltip="true" sortable>
         <template slot-scope="scope">
           <span v-if="item.label == 'ifCntrno'">
 
-            <span v-if="scope.row.ifCntrno=='1'">是</span>
+            <span v-if="scope.row.ifCntrno == '1'">是</span>
             <span v-else>否</span>
           </span>
           <span v-else>{{ scope.row[item.label] }}</span>
@@ -259,85 +121,42 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="fStatus">
         <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.fStatus"
-            active-value="0"
-            inactive-value="1"
-            v-hasPermi="['basicdata:goods:edit']"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
+          <el-switch v-model="scope.row.fStatus" active-value="0" inactive-value="1"
+            v-hasPermi="['basicdata:goods:edit']" @change="handleStatusChange(scope.row)"></el-switch>
         </template>
       </el-table-column>
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="remark"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="150"
-        fixed="right"
-      >
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['basicdata:goods:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['basicdata:goods:remove']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['basicdata:goods:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['basicdata:goods:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改商品详情对话框 -->
-    <el-dialog
-      v-dialogDrag
-      :fullscreen="dialogFull"
-      width="80%"
-      :title="title"
-      :visible.sync="open"
-      :close-on-click-modal="false"
-      append-to-body
-    >
+    <el-dialog v-dialogDrag :fullscreen="dialogFull" width="80%" :title="title" :visible.sync="open"
+      :close-on-click-modal="false" append-to-body>
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
-            <span
-              style="
+            <span style="
                 display: inline-block;
                 width: 3px;
                 height: 20px;
                 margin-right: 5px;
                 float: left;
                 margin-top: 2px;
-              "
-            ></span>
+              "></span>
             添加商品详情
           </span>
           <div class="avue-crud__dialog__menu enlarge" @click="full">
-            <i
-              style="
+            <i style="
                 cursor: pointer;
                 display: block;
                 width: 12px;
@@ -345,8 +164,7 @@
                 border: 1px solid #909399;
                 border-top: 3px solid #909399;
                 margin-top: -3px;
-              "
-            ></i>
+              "></i>
           </div>
         </div>
       </template>
@@ -384,10 +202,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="包装规格" prop="fPackagespecs">
-              <el-input
-                v-model="form.fPackagespecs"
-                placeholder="请输入包装规格"
-              />
+              <el-input v-model="form.fPackagespecs" placeholder="请输入包装规格" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -405,41 +220,45 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="包装类型" prop="fPackageid">
-              <el-input
-                v-model="form.fPackageid"
-                placeholder="请输入包装类型"
-              />
+              <el-input v-model="form.fPackageid" placeholder="请输入包装类型" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="账册号" prop="fEmsNo">
-              <el-input v-model="form.fEmsNo" placeholder="请输入账册号"/>
+              <el-input v-model="form.fEmsNo" placeholder="请输入账册号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="账册序号" prop="fEmsSeqNo">
-              <el-input v-model="form.fEmsSeqNo" placeholder="请输入账册序号"/>
+              <el-input v-model="form.fEmsSeqNo" placeholder="请输入账册序号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="申报单位" prop="fWmsDclUnit">
-              <el-input v-model="form.fWmsDclUnit" placeholder="请输入申报计量单位"/>
+              <el-input v-model="form.fWmsDclUnit" placeholder="请输入申报计量单位" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="法定单位" prop="fWmsLawUnit">
-              <el-input v-model="form.fWmsLawUnit" placeholder="请输入法定计量单位"/>
+              <el-input v-model="form.fWmsLawUnit" placeholder="请输入法定计量单位" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="商品编码" prop="fGoodsTs">
-              <el-input v-model="form.fGoodsTs" placeholder="请输入商品编码"/>
+              <el-input v-model="form.fGoodsTs" placeholder="请输入商品编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="库存预警" prop="stockWarning">
+              <el-input v-model="form.stockWarning" placeholder="请输入库存预警">
+                <template slot="append">KG</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -450,12 +269,8 @@
                 <el-radio label="1">请选择字典生成</el-radio>
               </el-radio-group>-->
               <el-radio-group v-model="form.fStatus">
-                <el-radio
-                  v-for="dict in statusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                  >{{ dict.dictLabel }}</el-radio
-                >
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel
+                }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -470,22 +285,14 @@
         </el-row>
 
         <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="form.remark"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-row>
           <el-col :span="12">
             <el-form-item label="商品类别" prop="fTypeid">
               <el-select v-model="form.fTypeid" placeholder="请选择商品类别">
-                <el-option
-                  v-for="dict in fTypeidOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="parseInt(dict.dictValue)"
-                ></el-option>
+                <el-option v-for="dict in fTypeidOptions" :key="dict.dictValue" :label="dict.dictLabel"
+                  :value="parseInt(dict.dictValue)"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -723,20 +530,27 @@ export default {
         },
         {
           surface: "13",
+          label: "stockWarning",
+          name: "库存预警",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
           label: "fWmsDclUnit",
           name: "申报单位",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "15",
           label: "fWmsLawUnit",
           name: "法定单位",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "16",
           label: "ifCntrno",
           name: "是否按照箱号统计",
           checked: 0,
@@ -1020,22 +834,27 @@ export default {
   -ms-flex-pack: justify;
   justify-content: space-between;
 }
+
 .el-dialog__title {
   color: rgba(0, 0, 0, 0.85);
   font-weight: 500;
   word-wrap: break-word;
 }
+
 .avue-crud__dialog__menu {
   padding-right: 20px;
   float: left;
 }
+
 .avue-crud__dialog__menu i {
   color: #909399;
   font-size: 15px;
 }
+
 .el-icon-full-screen {
   cursor: pointer;
 }
+
 .el-icon-full-screen:before {
   content: "\e719";
 }
@@ -1045,15 +864,18 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+
 .listStyle {
   display: flex;
   border-top: 1px solid #dcdfe6;
   border-left: 1px solid #dcdfe6;
   border-right: 1px solid #dcdfe6;
 }
+
 .listStyle:last-child {
   border-bottom: 1px solid #dcdfe6;
 }
+
 .progress {
   display: flex;
   align-items: center;

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -2166,7 +2166,7 @@ export default {
           this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
         }
         this.fWbuOptionsN = response.data.feesList
-        let queryParams = { fName: name }
+        // let queryParams = { fName: name }
         listFees(queryParams).then((response) => {
           this.fWbuOptionsN = response.rows
         })