Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/api/reportManagement/whgenleg.js

@@ -69,3 +69,11 @@ export  function superviseExportWhgenleg(query) {
     params: query
   })
 }
+
+// 分类监管仓库导出
+export function warehouseSupervise() {
+  return request({
+    url: '/warehouseBusiness/whgenleg/warehouseSupervise',
+    method: 'get',
+  })
+}

src/views/basicdata/dept/index.vue

@@ -72,6 +72,12 @@
           <span v-else>否</span>
         </template>
       </el-table-column>
+      <el-table-column prop="supervise" label="监管" width="50">
+        <template slot-scope="scope">
+          <span v-if="scope.row.supervise === 0">否</span>
+          <span v-else>是</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="remark" label="备注" width="100"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="50"></el-table-column>
       <el-table-column prop="fStatus" label="状态" :formatter="statusFormat" width="50"></el-table-column>
@@ -232,6 +238,14 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否监管库" prop="supervise" label-width="82px">
+              <el-select v-model="form.supervise" style="width: 100%">
+                <el-option label="是" :value="1" />
+                <el-option label="否" :value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <!--<el-form-item label="状态，默认 T ,正常T 停用F 下拉选择">
@@ -470,6 +484,7 @@ export default {
         this.form.parentId = row.fId;
       }
       this.$set(this.form, 'fStatus', '0')
+      this.$set(this.form, 'supervise', 0)
       // this.form.fStatus = '0'
       this.open = true;
       this.title = "添加仓库";

src/views/reportManagement/whgenleg/index.vue

@@ -180,6 +180,12 @@
             type="primary"
             icon="el-icon-download"
             size="mini"
+            @click="warehouseSupervise"
+          >分类监管仓库导出</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
             @click="superviseExport"
             v-hasPermi="['warehouseBusiness:whgenleg:superviseExport']"
             >分类监管导出</el-button>
@@ -417,7 +423,9 @@ import {
   delWhgenleg,
   addWhgenleg,
   updateWhgenleg,
-  exportWhgenleg, superviseExportWhgenleg
+  exportWhgenleg,
+  superviseExportWhgenleg,
+  warehouseSupervise
 } from '@/api/reportManagement/whgenleg'
 import { listWarehouse, treeselect } from "@/api/basicdata/warehouse";
 import { listArea } from "@/api/basicdata/area";
@@ -1088,6 +1096,18 @@ export default {
         this.download(response.msg);
       })
     },
+    /** 分类监管仓库导出 */
+    warehouseSupervise() {
+      this.$confirm("确认是否导出分类监管仓库数据?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(function() {
+        return warehouseSupervise();
+      }).then((response) => {
+        this.download(response.msg);
+      })
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;