界面增加

base-ui/src/api/kucun/kucun.js

@@ -16,6 +16,13 @@ export function kchzyc(data) {
     data: data
   })
 }
+// 重置缓存
+export function resetAllCache() {
+  return request({
+    url: '/kucun/resetAllCache',
+    method: 'get'
+  })
+}
 // 条件查询
 export function downloadhz(parm) {
   return request({

base-ui/src/router/index.js

@@ -121,7 +121,7 @@ export const constantRoutes = [{
           title: '销售报表上传',
           noCache: true
         }
-      },
+      }
       //   {
       //   path: 'xssb',
       //   component: () => import('@/views/xiaoshou/salesreport/salesreport.vue'),
@@ -218,6 +218,22 @@ export const constantRoutes = [{
         title: '出库明细',
         noCache: true
       }
+    }, {
+      path: 'xssjgl',
+      component: () => import('@/views/kucun/xssjgl/index.vue'),
+      name: 'KucunXssjglIndex',
+      meta: {
+        title: '销售数据管理',
+        noCache: true
+      }
+    }, {
+      path: 'pfsjgl',
+      component: () => import('@/views/kucun/pfsjgl/index.vue'),
+      name: 'KucunPfsjglIndex',
+      meta: {
+        title: '批发数据管理',
+        noCache: true
+      }
     }]
   },
   // // 3库存信息

base-ui/src/views/kucun/kcxxcx/index.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="app-container">
     <el-card class="box-card">
-      <div slot="header" class="clearfix"><span>导入库存信息查询</span></div>
+      <div slot="header" class="clearfix">
+        <span>导入库存信息查询</span>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="resetCache">缓存数据重置(监管商品、仓店索引、供应商索引)</el-button>
+      </div>
       <div>
         <el-upload
           ref="upload"
@@ -43,7 +46,7 @@
 </template>
 
 <script>
-import { kchz, kchzyc } from '@/api/kucun/kucun'
+import { kchz, kchzyc, resetAllCache } from '@/api/kucun/kucun'
 export default {
   name: 'KucunKcxxcxIndex',
   // components: {  },
@@ -154,6 +157,18 @@ export default {
     },
     doDownloadHzYc() {
       window.open(this.ychzFilePath, '_blank')
+    },
+    resetCache() {
+      resetAllCache()
+        .then()(res => {
+          this.$message({
+            message: '缓存数据已重置！',
+            type: 'success'
+          })
+        })
+        .catch(e => {
+          console.log('resetAllCache', e)
+        })
     }
   }
 }

base-ui/src/views/supervise/purchaseapplicationmanagement/purchaseapplicationmanagementAdd.vue

@@ -18,10 +18,12 @@
             :on-success="handleSuccess"
             :multiple="false"
             :show-file-list="false"
-            :limit="1">
+            :limit="1"
+          >
             <el-button type="primary" size="small">导入采购订单表</el-button>
           </el-upload>
         </div>
+        <el-button type="primary" size="small" :disabled="candownload" @click="downCheckExcel">下载审核结果</el-button>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
         <el-button type="primary" size="small" :disabled="submitdisabled">提交审核</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@@ -33,103 +35,103 @@
     <!-- Start 新增修改部分 -->
     <div class="listconadd">
       <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
-        <div class="title">
+        <div class="title"><div>采购订单信息</div></div>
-          <div>采购订单信息</div>
-        </div>
         <el-row>
-          <el-col :span="4" class="tleftb">
+          <el-col :span="4" class="tleftb"><span>订单编号</span></el-col>
-            <span>订单编号</span>
-          </el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.code }}</span></el-form-item>
+            <el-form-item>
-          </el-col>
+              <span>{{ formobj.code }}</span>
-          <el-col :span="4" class="tleftb">
+            </el-form-item>
-            <span>填单人</span>
           </el-col>
+          <el-col :span="4" class="tleftb"><span>填单人</span></el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.buyerName }}</span></el-form-item>
+            <el-form-item>
+              <span>{{ formobj.buyerName }}</span>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="tleftb">
+          <el-col :span="4" class="tleftb"><span>供货单位</span></el-col>
-            <span>供货单位</span>
-          </el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.supplierName }}</span></el-form-item>
+            <el-form-item>
-          </el-col>
+              <span>{{ formobj.supplierName }}</span>
-          <el-col :span="4" class="tleftb">
+            </el-form-item>
-            <span>仓位</span>
           </el-col>
+          <el-col :span="4" class="tleftb"><span>仓位</span></el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.warehousePosition }}</span></el-form-item>
+            <el-form-item>
+              <span>{{ formobj.warehousePosition }}</span>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="tleftb">
+          <el-col :span="4" class="tleftb"><span>采购员</span></el-col>
-            <span>采购员</span>
-          </el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.buyerName }}</span></el-form-item>
+            <el-form-item>
-          </el-col>
+              <span>{{ formobj.buyerName }}</span>
-          <el-col :span="4" class="tleftb">
+            </el-form-item>
-            <span>入库单位</span>
           </el-col>
+          <el-col :span="4" class="tleftb"><span>入库单位</span></el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.purchasingDeptName }}</span></el-form-item>
+            <el-form-item>
+              <span>{{ formobj.purchasingDeptName }}</span>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="tleftb">
+          <el-col :span="4" class="tleftb"><span>要货单位</span></el-col>
-            <span>要货单位</span>
-          </el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.purchasingDeptName }}</span></el-form-item>
+            <el-form-item>
-          </el-col>
+              <span>{{ formobj.purchasingDeptName }}</span>
-          <el-col :span="4" class="tleftb">
+            </el-form-item>
-            <span>入库仓位</span>
           </el-col>
+          <el-col :span="4" class="tleftb"><span>入库仓位</span></el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.warehousePosition }}</span></el-form-item>
+            <el-form-item>
+              <span>{{ formobj.warehousePosition }}</span>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="tleftb">
+          <el-col :span="4" class="tleftb"><span>填单日期</span></el-col>
-            <span>填单日期</span>
-          </el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.purchaseDate }}</span></el-form-item>
+            <el-form-item>
-          </el-col>
+              <span>{{ formobj.purchaseDate }}</span>
-          <el-col :span="4" class="tleftb">
+            </el-form-item>
-            <span>到货日期</span>
           </el-col>
+          <el-col :span="4" class="tleftb"><span>到货日期</span></el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.arrivalDate }}</span></el-form-item>
+            <el-form-item>
+              <span>{{ formobj.arrivalDate }}</span>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="tleftb">
+          <el-col :span="4" class="tleftb"><span>单据到效期</span></el-col>
-            <span>单据到效期</span>
-          </el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.expiryDate }}</span></el-form-item>
+            <el-form-item>
-          </el-col>
+              <span>{{ formobj.expiryDate }}</span>
-          <el-col :span="4" class="tleftb">
+            </el-form-item>
-            <span>完成状态</span>
           </el-col>
+          <el-col :span="4" class="tleftb"><span>完成状态</span></el-col>
           <el-col :span="8" class="trightb">
-            <el-form-item><span>{{ formobj.completionStatus }}</span></el-form-item>
+            <el-form-item>
+              <span>{{ formobj.completionStatus }}</span>
+            </el-form-item>
           </el-col>
         </el-row>
         <div class="title">
           <div>采购商品明细</div>
-          <div><span style="padding-right: 20px">合计数量:{{ totalQuantity }}</span><span>合计金额:{{ amountInTotal }}</span></div>
+          <div>
+            <span style="padding-right: 20px">合计数量:{{ totalQuantity }}</span>
+            <span>合计金额:{{ amountInTotal }}</span>
+          </div>
         </div>
         <el-table :key="tableKey" :data="formobj.pros" :index="index" border style="width: 100%">
-          <el-table-column fixed label="序号" width="80px" type="index" :index="index + 1" align="center"/>
+          <el-table-column fixed label="序号" width="80px" type="index" :index="index + 1" align="center" />
           <el-table-column fixed label="操作" width="100px" align="center" header-align="center">
             <template slot-scope="scope">
-              <el-button size="mini" type="danger" @click="dataDelete(scope.$index)">删除
+              <el-button size="mini" type="danger" @click="dataDelete(scope.$index)">删除</el-button>
-              </el-button>
             </template>
           </el-table-column>
           <el-table-column label="商品代码" align="center" width="200">
@@ -240,6 +242,7 @@ export default {
   name: 'PurchaseApplicationManagementAdd',
   data() {
     return {
+      candownload: true,
       submitdisabled: false,
       viewTitle: '',
       tableKey: 0,
@@ -319,7 +322,9 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '【审核编号】'
-      req.fetchBySid(row.sid).then((resp) => {
+      req
+        .fetchBySid(row.sid)
+        .then(resp => {
           if (resp.success) {
             this.formobj = resp.data
             if (this.formobj.pros.length > 0) {
@@ -335,10 +340,14 @@ export default {
           } else {
             // 根据resp.code进行异常情况处理
           }
-      }).catch(e => {
+        })
+        .catch(e => {
           this.formobj = row
         })
     },
+    downCheckExcel() {
+      window.location.href = process.env.VUE_APP_BASE_API + '/v1/productnum/products?code='+this.formobj.code
+    },
     handleDownload() {
       window.location.href = process.env.VUE_APP_BASE_API + '/v1/purchaserequisition/yb'
     },
@@ -356,6 +365,11 @@ export default {
           }
           this.amountInTotal = aa
         }
+        
+        console.log(',,1111',this.formobj.code)
+        if (this.formobj.code) {
+          this.candownload = false
+        }
       } else {
         this.$message({ showClose: true, type: 'error', message: resp.msg })
       }
@@ -374,7 +388,9 @@ export default {
       this.$refs['form_obj'].validate(valid => {
         if (valid) {
           this.submitdisabled = true
-          req.saveOrUpdate(this.formobj).then((resp) => {
+          req
+            .saveOrUpdate(this.formobj)
+            .then(resp => {
               this.submitdisabled = false
               if (resp.success) {
                 this.$message({ showClose: true, type: 'success', message: resp.msg })