修改平台审核

src/api/V2/statisticalReport/index.js

@@ -81,8 +81,7 @@ export const API_POST_ADDDISORREMARKS = '/stockPurchaseReceiptReport/api/disAndR
 export const API_POST_EDITSETTLEMENTWEIGHT = '/stockPurchaseReceiptReport/api/edit'
 //现货采购入库合同
 export const API_GET_STOCK_PURCHASE_CONTRACTNO = '/stockPurchaseReceiptReport/selectContractNoList'
-//现货采购入库导出
-export const API_GET_STOCK_PURCHASE_EXPORT ='/stockPurchaseReceiptReport/export'
+
 
 //现货销售出库报表
 export const API_GET_STOCKSALECEIPT = '/stockSaleReceiptReport/selectSaleOrder'

src/api/V2/warehouse/index.js

@@ -88,8 +88,6 @@ export const API_POST_EXPORTOUT = '/warehouseBaseInfo/exportOut'
 export const API_GET_PRINT = '/commonConstantFalse/getInfo'
 // 仓位号
 export const API_GET_WAREHOUSE_BINNUMBER = '/warehouseBaseInfo/getWarehouse'
-// 储量明细
-export const API_GET_WAREHOUSE_BASEINFO_RESERVES = '/warehouseBaseInfo/reservesDetails'
 //添加折转
 export const API_POST_TURNAROUND_ADD = '/turnInfo/api/addTurn'
 //折转列表
@@ -98,9 +96,6 @@ export const API_GET_TURNAROUND_LIST = '/turnInfo/selectTurnInfo'
 export const API_GET_TURNAROUND_XIALA = '/turnInfo/getPositionAndGoodsName'
 //折转后货名
 export const API_get_goodsName_All = '/commonSysParameter/getInfo'
-//查看仓储部负责人
-export const API_GET_WAREHOUSE_RESPONSIBLE = '/staff/query/getPost'
-//修改自动创建的临时库入库量
-export const API_POST_WAREHOUSE_INWEIGHT = '/warehouseInOutInfo/updateStockQuantity'
-//查看全部仓库
-export const API_GET_WAREHOUSE_ALL = '/warehouseBaseInfo/allWarehouse'
+
+
+

src/components/WsUpload/index.vue

@@ -39,7 +39,17 @@
       </template>
       <template v-slot:file="{ file }">
         <div class="thumbnail-group">
+          <winsea-picture-view
+            v-if="isPictureFile(file)"
+            class="el-upload-list__item-thumbnail"
+            picturesShowType="fold"
+            :pic-small-list="_getFileImg(file)"
+            :pic-list="_getFileImgs"
+            :width="110"
+            :height="110"
+          />
           <img
+            v-else
             class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"
           />

src/model/statisticalReport/index.js

@@ -48,8 +48,7 @@ import {
     API_GET_YUNSHUNUMBER,
     API_POST_YUNSHUSETPRICE,
     API_POST_EDIT_SETTLEMENTWEIGHT,
-    API_POST_INVOICELIST,
-    API_GET_STOCK_PURCHASE_EXPORT
+    API_POST_INVOICELIST
 } from '@/api/V2/statisticalReport'
 //期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -95,7 +94,7 @@ export const postopeninvoice = appRx.post(API_POST_OPENINVOICE, errorCatcher, er
 export const postbatchopeninvoice = appRx.post(API_POST_BATCHOPENINVOICE, errorCatcher, errorHandle, filter)
 
 
-export const export1 = appRx.post(API_GET_STOCK_PURCHASE_EXPORT)
+
 //期货销售出库报表
 export const salelist = appRx.get(API_GET_SALELIST, errorCatcher, errorHandle, filter)
 //期货销售出库出纳收款

src/model/warehouse/index.js

@@ -43,15 +43,10 @@ import {
     API_GET_PRINT,
     API_POST_EXPORTOUT,
     API_GET_WAREHOUSE_BINNUMBER,
-
-    API_GET_WAREHOUSE_BASEINFO_RESERVES,
     API_GET_TURNAROUND_LIST,
     API_POST_TURNAROUND_ADD,
     API_GET_TURNAROUND_XIALA,
     API_get_goodsName_All,
-    API_GET_WAREHOUSE_RESPONSIBLE,
-    API_POST_WAREHOUSE_INWEIGHT,
-    API_GET_WAREHOUSE_ALL
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -147,12 +142,5 @@ export const turnAroundList = appRx.get(API_GET_TURNAROUND_LIST,errorCatcher, er
 export const turnAroundXiaLa = appRx.get(API_GET_TURNAROUND_XIALA,errorCatcher, errorHandle, filter)
 //折转后所有货名
 export const turnAroundGoodsNameAll = appRx.get(API_get_goodsName_All,errorCatcher, errorHandle, filter)
-//储量明细
-export const  getreserves = appRx.get(API_GET_WAREHOUSE_BASEINFO_RESERVES, errorHandle, filter)
-//查看仓储部负责人
-export const  getResponsible = appRx.get(API_GET_WAREHOUSE_RESPONSIBLE, errorHandle, filter)
-//修改自动创建的临时库入库量
-export const  postInWeight = appRx.post(API_POST_WAREHOUSE_INWEIGHT, errorHandle, filter)
-//查看全部仓库
-export const  getWarehouseAll = appRx.get(API_GET_WAREHOUSE_ALL, errorHandle, filter)
+
 

src/views/contractManagement/salesContractAdd.vue

@@ -15,7 +15,7 @@
         <div class="remark">
           <h3>基本信息</h3>
           <p style="color: #8890b1">
-            &nbsp;&nbsp;注：基本信息均为必填项，“<span style="color:red">*</span>”
+            &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
             标记的条目提交后不可修改。
           </p>
         </div>
@@ -1064,13 +1064,13 @@
           })
           return
         }
-        // if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
-        //   this.$message({
-        //     message: '请输入水分',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
+        if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
+          this.$message({
+            message: '请输入水分',
+            type: 'warning',
+          })
+          return
+        }
         if (
           (this.deptBudgetList.contractGoodsInfo.waterContent &&
             String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf(
@@ -1098,13 +1098,13 @@
           })
           return
         }
-        // if (!this.deptBudgetList.contractGoodsInfo.impurity) {
-        //   this.$message({
-        //     message: '请输入杂质',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
+        if (!this.deptBudgetList.contractGoodsInfo.impurity) {
+          this.$message({
+            message: '请输入杂质',
+            type: 'warning',
+          })
+          return
+        }
         if (
           (this.deptBudgetList.contractGoodsInfo.impurity &&
             String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') !=
@@ -1124,13 +1124,13 @@
           })
           return
         }
-        // if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
-        //   this.$message({
-        //     message: '请输入容重',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
+        if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
+          this.$message({
+            message: '请输入容重',
+            type: 'warning',
+          })
+          return
+        }
         if (
           (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
             String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf(
@@ -1151,15 +1151,15 @@
           })
           return
         }
-        // if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
-        //   this.$message({
-        //     message: '请输入霉变粒',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
+        if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
+          this.$message({
+            message: '请输入霉变粒',
+            type: 'warning',
+          })
+          return
+        }
         if (
-          this.deptBudgetList.contractGoodsInfo.mildewGrain ||
+          !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
           (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
               '.'
             ) != -1 &&
@@ -1178,15 +1178,15 @@
           })
           return
         }
-        // if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
-        //   this.$message({
-        //     message: '请输入热损伤',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
+        if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
+          this.$message({
+            message: '请输入热损伤',
+            type: 'warning',
+          })
+          return
+        }
         if (
-          this.deptBudgetList.contractGoodsInfo.jiaorenli ||
+          !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
           (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
             -1 &&
             String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
@@ -1204,15 +1204,15 @@
           })
           return
         }
-        // if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
-        //   this.$message({
-        //     message: '请输入不完善粒',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
+        if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
+          this.$message({
+            message: '请输入不完善粒',
+            type: 'warning',
+          })
+          return
+        }
         if (
-          this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
+          !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
           (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
               '.'
             ) != -1 &&

src/views/platformaudit/component/routers/route.js

@@ -1,63 +0,0 @@
-import Layout from '@/layout/index';
-
-const contractManagementRouter = {
-  path: '/contractManagement',
-  component: Layout,
-  redirect: '/contractManagement',
-  name: 'platformAudit',
-  alwaysShow: true, // will always show the root menu
-  meta: {
-    title: 'platformAudit',
-    module: 'contractManagement',
-    icon: '-hetongguanli'
-  },
-  children: [
-    {
-      path: 'salesContract',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/salesContract'),
-      name: 'salesContract',
-      meta: {
-        title: 'salesContract',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
-    // 司机审核
-    {
-      path: 'driverAudit',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/purchaseContract'),
-      name: 'driveraudit',
-      meta: {
-        title: 'driveraudit',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract',
-        permissicon: [],
-        keepAlive: true
-      }
-    },
-    {
-      path: 'purchaseContractExamine',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/purchaseContractExamine'),
-      name: 'purchaseContractExamine',
-      meta: {
-        title: 'purchaseContractExamine',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract.buyContractInfo.view',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    
-  ],
-
-};
-
-export default contractManagementRouter;

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -54,12 +54,6 @@
             @click="dis()"
             >定金</ws-button
           >
-          <ws-button
-            type="primary"
-            v-hasPermission="`report.goodsProcurementInReport.view`"
-            @click="exportlist()"
-            >导出</ws-button
-          >
         </el-col>
         <el-col style="text-align: right; line-height: 60px;  width:300px" :span="8">
         <el-date-picker style="margin: 0 10px 0 0" value-format='yyyy-MM-dd' v-model="value2" @change='datechange'
@@ -166,6 +160,7 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column
+          :selectable="selectInit"
           type="selection"
           width="55"
         ></el-table-column>
@@ -442,17 +437,13 @@ import {
   editSettlementWeight,
   addDisOrRemarks,
   stockPurchasePayMoney,
-  export1
 } from '@/model/statisticalReport/index'
 import { workflowcontent } from '@/model/houseSelfCollect/index'
 import { downloadFile } from '@/utils/batchDown'
 import { posthandle } from '@/model/purchasingManagement/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import {
-    dayjs,
-    EventBus
-  } from 'base-core-lib'
+import { EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -578,10 +569,6 @@ export default {
       accessoryTFs1: false,
       appendixIdss: [],
       appendixIdss1:'',
-      date: {
-          year: dayjs().format('YYYY'),
-          month: dayjs().format('MM'),
-        },
     }
   },
   activated() {
@@ -697,7 +684,15 @@ export default {
     },
     selectInit(row) {
       //在这里一定要记得类型匹配的上。
-      
+      if (row.approveStatus == null) {
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          return true
+        }
+      }
     },
     //添加定金信息
     dis() {
@@ -897,18 +892,6 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要审核的条目')
       } else {
-        for (let i = 0; i < this.modification.length; i++) {
-          if (this.modification[i].approveStatus == null) {
-              this.$message.warning('请选择一条待审核的条目')
-              return
-          } else if (this.modification[i].approveStatus != null) {
-            if (this.modification[i].taskId == null) {
-              this.$message.warning('请选择一条待审核的条目')
-              return 
-            } else {
-            }
-          }
-        }
         this.$confirm(`审核通过后，任务将发送给下一级，是否确定通过？`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
@@ -958,18 +941,6 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择要驳回的条目')
       } else {
-         for (let i = 0; i < this.modification.length; i++) {
-          if (this.modification[i].approveStatus == null) {
-              this.$message.warning('请选择一条待审核的条目')
-              return
-          } else if (this.modification[i].approveStatus != null) {
-            if (this.modification[i].taskId == null) {
-              this.$message.warning('请选择一条待审核的条目')
-              return 
-            } else {
-            }
-          }
-        }
         this.$confirm(`是否确定驳回？`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
@@ -1235,7 +1206,14 @@ export default {
     async exportlist() {
       const { data } = await export1(
         {
-         stockPurchaseReceiptReportList: this.modification,
+          compId: localStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
         },
         {},
         { responseType: 'blob' }

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -502,7 +502,7 @@
 			},
 			returnsales() {
 				this.dataList = {
-								taskTypeKey: '1'
+								taskTypeKey: 1
 							}
 				this.$router.push({
 					path: 'tranManagementWarehouseInOuttask'
@@ -765,7 +765,7 @@
 						this.$message.success('添加成功')
 						setTimeout(function() {
 							that.dataList = {
-								taskTypeKey: '1'
+								taskTypeKey: 1
 							}
 							that.dataList1 = {}
 							that.$router.push({

src/views/warehouse/warehouseManagementIoss.vue

@@ -2,7 +2,7 @@
   <div class="container">
     <el-row>
       <el-col :span="20">
-        <h2 class="bg-left title">&nbsp;&nbsp;盘点当期盈亏</h2>
+        <h2 class="bg-left title">&nbsp;&nbsp;盘损当期仓损</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
         <el-button