前端

src/api/V2/warehouse/index.js

@@ -193,3 +193,9 @@ export const API_GET_GETQUALITYZHE = '/warehouseBaseInfo/getQuantityZhe'
 export const API_GET_GETQUALITYREAL = '/warehouseBaseInfo/getQuantityReal'
 //销售转移
 export const API_SALESTRANINFO = '/salesTransferInfo/api/salesTransfer'
+// 物料导出
+export const API_GET_EXPORT ='/materialWarehouseInOut/exportMaterialWarehouse'
+// 导出入库(佳屹农)
+export const API_GET_EXPORTJYNIN ='/warehouseBaseInfo/exportInJyn'
+// 导出出库(佳屹农)
+export const API_GET_EXPORTJYNOUT ='/warehouseBaseInfo/exportOutJyn'

src/components/WsUpload/index.vue

@@ -23,7 +23,7 @@
         <i class="el-icon-question"></i>
       </el-tooltip> -->
       
-      <div class="tip">
+      <div v-if='tipstatus' class="tip">
         {{ $t('upload.uploadText01') }}
         {{  formatTxt}}
         格式的文件，单个文件大小不能超过10M
@@ -146,6 +146,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    tipstatus:{
+      type: Boolean,
+      default: true,
+    },
     remarkWord: {
       // 是否有备注要求
       type: Boolean,

src/model/warehouse/index.js

@@ -93,7 +93,10 @@ import {
     API_GET_LOOKMATERIAL,
     API_GET_GETQUALITYZHE,
     API_GET_GETQUALITYREAL,
-    API_SALESTRANINFO
+    API_SALESTRANINFO,
+    API_GET_EXPORT,
+    API_GET_EXPORTJYNIN,
+    API_GET_EXPORTJYNOUT
     // API_GET_EXPENSEINFO
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
@@ -178,6 +181,8 @@ export const getReceiptTaskNo = appRx.get(API_GET_RECEIPTTASKNO,errorCatcher, er
 export const postExport = appRx.post(API_POST_EXPORT)
 //导出出库
 export const postExportOut = appRx.post(API_POST_EXPORTOUT)
+//物料导出
+export const postExportMaterial = appRx.post(API_GET_EXPORT)
 //导出历史库存记录
 export const exportHistoricalInventory = appRx.post(API_POST_EXPORTHISTORICALINVENTORY)
 //打印增量
@@ -287,3 +292,6 @@ export const getQualityZhe = appRx.get(API_GET_GETQUALITYZHE, errorCatcher, erro
 export const getQualityReal = appRx.get(API_GET_GETQUALITYREAL, errorCatcher, errorHandle, filter)
 //销售转移
 export const salestraninfo = appRx.post(API_SALESTRANINFO, errorCatcher, errorHandle, filter)
+// 佳屹农导出入库出库
+export const postExportjynin = appRx.post(API_GET_EXPORTJYNIN)
+export const postExportjynout = appRx.post(API_GET_EXPORTJYNOUT)

src/views/contractManagement/acquisitionContractExamine.vue

@@ -49,6 +49,9 @@
         <ws-form-item label="合同编号" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
+        <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+          {{ deptBudgetList.pointOut }}
+        </ws-form-item>
         <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           {{deptBudgetList.transactionSubject}}
         </ws-form-item>

src/views/contractManagement/collectionContractExamine.vue

@@ -50,6 +50,9 @@
         <ws-form-item label="合同编号" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
+        <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+          {{ deptBudgetList.pointOut }}
+        </ws-form-item>
         <ws-form-item label="结算方式" span="1" prop="settlementMethod">{{ deptBudgetList.settlementMethod }}
         </ws-form-item>
         <ws-form-item label="买方" span="1" prop="buyer">

src/views/contractManagement/purchaseContractExamine.vue

@@ -52,6 +52,9 @@
         <ws-form-item label="合同编号" v-if="deptBudgetList.agreementType=='采购合同'" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
+        <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+          {{ deptBudgetList.pointOut }}
+        </ws-form-item>
         <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           {{deptBudgetList.transactionSubject}}
         </ws-form-item>

src/views/contractManagement/salesContractExamine.vue

@@ -57,6 +57,9 @@
               {{ deptBudgetList.contractNo }}
             </div>
           </ws-form-item>
+          <ws-form-item  label="合同提示" span="1" prop="contractNo" >
+          {{ deptBudgetList.pointOut }}
+        </ws-form-item>
           <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           <div class="unchanged">
               {{deptBudgetList.transactionSubject}}

src/views/houseSelfCollect/inspectInfoLook.vue

@@ -221,11 +221,52 @@
               <ws-input @mousewheel.native.prevent v-model="inspect.reColorLustre"
                 placeholder="请输入复检色泽/气味是否正常" maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检' || statusShow == '已复检'">
-              <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-if="statusShow != '已复检'" />
-              <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-else disabled />
+            <ws-form-item label="复检备注" span="2" prop="reMemo" >
+              <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" disabled />
             </ws-form-item>
-          </ws-info-table>
+
+            <ws-form-item label="规格（公斤）" span="1" prop="boxNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <el-select disabled filterable clearable v-model="inspect.specifications" placeholder="请选择规格"
+                    class="typeselect" >
+                    <el-option label="830" value="830" />
+                    <el-option label="850" value="850" />
+                  </el-select>
+              </ws-form-item>
+              <ws-form-item label="工厂" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input disabled v-model="inspect.factory" placeholder="请输入工厂" maxlength="30"
+                    size="small" />
+                </ws-form-item>
+                <ws-form-item label="生产日期" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                    <el-date-picker value-format="yyyy-MM-dd"  disabled v-model="inspect.produceDate" type="date" placeholder="选择生产日期"></el-date-picker>
+                </ws-form-item>
+                <ws-form-item label="污染件数" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input disabled v-model="inspect.polluteNum" placeholder="请输入污染件数" maxlength="30"
+                    size="small" />
+                </ws-form-item>
+                
+                <ws-form-item label="破损件数" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input disabled v-model="inspect.wornNum" placeholder="请输入破损件数" maxlength="30"
+                    size="small" />
+                </ws-form-item>
+                
+              </ws-info-table>
+              <ws-info-table class='upload-address-wrap'>
+                <ws-form-item class='upload-address' label="污染附件" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-upload :editable="false" ref="upload"  :comp-id="compId" :appendix-ids="inspect.polluteUrl" :size-limit="size"
+                  accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+                </ws-form-item>
+                <ws-form-item class='upload-address' label="破损附件" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-upload ref="upload1" :editable="false"  :comp-id="compId" :appendix-ids="inspect.wornUrl" :size-limit="size"
+                   accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+                </ws-form-item>
+              </ws-info-table>
           <div class="but">
             <el-button @click="cancel" v-if="types != 2" type="primary">取消</el-button>
                <el-button @click="checkOk" v-if="types == 4" type="primary">确认初检信息</el-button>
@@ -261,9 +302,11 @@
   import inspectInfoPrint from './component/inspectInfoPrint.vue'
   import html2canvas from 'html2canvas'
   import axios from 'axios'
+  import WsUpload from '@/components/WsUpload'
   export default {
     components: {
       inspectInfoPrint,
+      WsUpload
     },
     watch: {},
     data() {
@@ -280,6 +323,9 @@
           type: '潮粮'
         },
         carNumberList: [],
+        compName:localStorage.getItem('ws-pf_compName'),
+        size:9,
+        compId: localStorage.getItem('ws-pf_compId'),
         disabled: false,
         disabled1: false,
         disabled2: false,
@@ -1370,4 +1416,11 @@
     text-align: center;
     // margin: 20px auto;
   }
+  /deep/.upload-address-wrap .el-form-item  .el-form-item__content{
+  height:300px;
+  align-items: flex-start;
+}
+/deep/.ws-upload{
+  overflow-x:scroll;
+}
 </style>

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -152,7 +152,7 @@
                     @change="carChange($event, 0)">
                     <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
                   </el-select> -->
-                  <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && serviceManagementType == 3"
+                  <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && !carstatus"
                     filterable clearable :allow-create="true" v-model="deptBudgetList.carNo" placeholder="请选择车牌号"
                     class="typeselect" @change="carChange($event, 1)">
                     <el-option v-for="item in carNumberList" :key="item.id" :label="item.carNo" :value="item.carNo" />
@@ -310,21 +310,21 @@
                 <ws-form-item v-if="serviceManagementType == 1 && deptBudgetList.outType == '汽运'" label="车牌号" span="1"
                   prop="carNo">
                   <ws-input :disabled="disabled2"
-                    v-if="carInputStatus"
+                    v-if="carInputStatus&&!carstatus"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                   <el-select :disabled="disabled2"
-                    v-if="!carInputStatus&&compName!='辽宁佳屹农商贸有限公司'"
+                    v-if="!carInputStatus&&carstatus"
                     filterable clearable v-model="deptBudgetList.carNo1" placeholder="请选择车牌号" class="typeselect"
-                    @change="carChange($event, 0)">
+                    @change="(val) => {carChange(val, 0)}">
                     <el-option v-for="(item, index) in options2" :key="index"
                       :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
                   </el-select>
-                  <el-select :disabled="disabled2" v-if="!carInputStatus&&compName=='辽宁佳屹农商贸有限公司'"
-                    filterable clearable :allow-create="true" v-model="deptBudgetList.carNo" placeholder="请选择车牌号"
-                    class="typeselect" @change="carChange($event, 1)">
-                    <el-option v-for="item in carNumberList" :key="item.id" :label="item.carNo" :value="item.carNo" />
+                  <el-select :disabled="disabled2" v-if="!carInputStatus&&!carstatus"
+                    filterable clearable v-model="deptBudgetList.carNo1" placeholder="请选择车牌号"
+                    class="typeselect" @change=" (val) => {carChange(val, 1)}">
+                    <el-option v-for="(item,index) in carNumberList" :key="item.id" :label="item.carNo" :value="index" />
                   </el-select>
-                  <el-button @click="editcarStatus" type="text">{{ cartext }}</el-button>
+                  <el-button v-if='switchStatus' @click="editcarStatus" type="text">{{ cartext }}</el-button>
 
                   <!-- <ws-input :disabled="disabled2"
                     v-if="options2.length == 0 && serviceManagementType == 1 && deptBudgetList.inOutType != '移库入库'&&deptBudgetList.inOutType != '退库' || statusTypetext != '初检'||deptBudgetList.inOutType == '退库'&&tranTaskFlag!=1"
@@ -549,8 +549,6 @@
                     type="number" @focus="pricefocus($event, 4)" @blur="priceblur($event, 4)" @input="deductionchange"
                     placeholder="请输入质量扣价" maxlength="40" size="small" />
                 </ws-form-item>
-              </ws-info-table>
-              <ws-info-table>
               <ws-form-item label="规格（公斤）" span="1" prop="boxNoOther"
                   v-if="compName=='辽宁佳屹农商贸有限公司'">
                   <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.specifications" placeholder="请选择规格"
@@ -564,6 +562,10 @@
                   <ws-input :disabled='recheck' v-model="deptBudgetList.factory" placeholder="请输入工厂" maxlength="30"
                     size="small" />
                 </ws-form-item>
+                <ws-form-item label="生产日期" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                    <el-date-picker value-format="yyyy-MM-dd"  :disabled='recheck' v-model="deptBudgetList.produceDate" type="date" placeholder="选择生产日期"></el-date-picker>
+                </ws-form-item>
                 <ws-form-item label="污染件数" span="1" prop="titleNoOther"
                   v-if="compName=='辽宁佳屹农商贸有限公司'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.polluteNum" placeholder="请输入污染件数" maxlength="30"
@@ -759,6 +761,7 @@ export default {
       cost: '',
       pageSize: 10,
       size:9,
+      switchStatus:false,
       cartext:'选择',
       carInputStatus:true,
       isShowPrint: false,
@@ -946,7 +949,8 @@ export default {
         this.warehouseNameChange(_WarehouseName.value)
       }
     }
-
+    var date = new Date()
+    this.deptBudgetList.produceDate = date.getFullYear()+'-'+((date.getMonth()+1)>=10?(date.getMonth()+1):'0'+(date.getMonth()+1))+'-'+((date.getDate())>=10?date.getDate():'0'+date.getDate())
   },
   // activated() {
 
@@ -1059,7 +1063,7 @@ export default {
     },
     shipInfoChange(e) {
       for (let i = 0; i < this.shipInfoList.length; i++) {
-        if (this.shipInfoList[i].shipName == this.deptBudgetList.shipName) {
+        if (this.shipInfoList[i].shipName == this.deptBudgetList.shipName) {carNo
           this.deptBudgetList.shipNumber = this.shipInfoList[i].shipNo
         }
       }
@@ -1204,10 +1208,17 @@ export default {
       })
     },
     carChange(e, status) {
-      console.log(this.carNumberList, e)
+      console.log(this.carNumberList,e,status)
       if (status == 1) {
         this.$set(this.deptBudgetList, 'customerName', this.carNumberList[e].shipperName)
         this.$set(this.deptBudgetList, 'customerPhone', this.carNumberList[e].shipperPhone)
+        this.$set(this.deptBudgetList, 'shipId', this.carNumberList[e].shipId)
+        
+        for (let i = 0; i < this.carNumberList.length; i++) {
+          if(i==e){
+            this.$set(this.deptBudgetList, 'carNo', this.carNumberList[e].carNo)
+          }
+        }
       }
 
       for (let i = 0; i < this.customerList1.length; i++) {
@@ -1680,6 +1691,9 @@ export default {
             this.deptBudgetList.reBulkDensity = response.bulkDensity
             this.deptBudgetList.reMildewGrain = response.mildewGrain
           }
+          if(this.statusTypetext == '初检'){
+            this.deptBudgetList.donecount = response.inOutWarehouseTask.completedQuantity + '/' + response.inOutWarehouseTask.weight
+          }
           this.deptBudgetList.warehouseInOutDetail = {
             grade: response.grade,
             reGrade: response.reGrade,
@@ -4120,8 +4134,10 @@ export default {
 
       if (this.outContractNo.deliverType == '1') {
         this.carstatus = true
+        this.switchStatus=false
       } else {
         this.carstatus = false
+        this.switchStatus=true
       }
       if (this.outContractNo.tranCarInfoList) {
         this.options2 = this.outContractNo.tranCarInfoList

src/views/houseSelfCollect/inspectionManagementrecord.vue

@@ -149,7 +149,7 @@
     </el-dialog>
     <div style="text-align: center;margin-top:20px">
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal">
       </el-pagination>
     </div>
@@ -171,6 +171,9 @@
   } from '@/model/houseSelfCollect/index'
   import inspectInfoPrint from './component/inspectInfoPrint.vue'
   import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+  } from 'base-core-lib'
   export default {
     components: {
       inspectInfoPrint,
@@ -394,6 +397,7 @@
           })
       },
       getList() {
+        console.log(this.pageSize)
         getinspectList({
             compId: localStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,

src/views/outboundManagement/component/route.js

@@ -96,6 +96,7 @@ const outboundManagementRouter = {
               title:'newQualityInspectionManagement',
               shortcutEntrance:'outboundManagement',
               module:'outbound.acquisitionQualityOut.view',
+              // module:'outbound.acquisitionWeightOut.view',
               permissicon: [],
               keepAlive: true,
               _title:'出库管理质检管理'
@@ -110,6 +111,7 @@ const outboundManagementRouter = {
           meta: {
             title: 'outInspectRecord',
             shortcutEntrance: 'outInspectRecord',
+            // module:'outbound.acquisitionWeightOut.view',
             module: 'outbound.acquisitionQualityOut.edit',
             permissicon: [],
             keepAlive: true,

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -182,6 +182,10 @@
                   <ws-input v-model="inspect.factory" placeholder="请输入工厂" maxlength="30"
                     size="small" />
                 </ws-form-item>
+                <ws-form-item label="生产日期" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                    <el-date-picker value-format="yyyy-MM-dd" v-model="inspect.produceDate" type="date" placeholder="选择生产日期"></el-date-picker>
+                </ws-form-item>
                 <ws-form-item label="污染件数" span="1" prop="titleNoOther"
                   v-if="compName=='辽宁佳屹农商贸有限公司'">
                   <ws-input v-model="inspect.polluteNum" placeholder="请输入污染件数" maxlength="30"
@@ -425,6 +429,8 @@
               }
               that.deptBudgetTotal2 = response.total
               that.success = response.total
+              var date = new Date()
+              that.inspect.produceDate = date.getFullYear()+'-'+((date.getMonth()+1)>=10?(date.getMonth()+1):'0'+(date.getMonth()+1))+'-'+((date.getDate())>=10?date.getDate():'0'+date.getDate())
             })
         } else {
           clearInterval(that.timer)

src/views/warehousenew/materialInOutRecord.vue

@@ -34,17 +34,25 @@
                 </el-col>
             </el-row>
             <el-row>
-                <el-col :span="18" style="height: 33px;">
+                <el-col :span="6" style="height: 33px;">
                     <el-button style="margin-left: 10px !important" @click="inOutChange('')"
                         :type="inOutFlag == '' ? 'primary' : ''">全部</el-button>
                     <el-button @click="inOutChange(2)" :type="inOutFlag == 2 ? 'primary' : ''">入库</el-button>
                     <el-button @click="inOutChange(1)" :type="inOutFlag == 1 ? 'primary' : ''">出库</el-button>
                 </el-col>
-                <el-col :span="18" style="display:flex;margin-left: 45%;">
-                    <div style="text-align:right;margin-right:80px;">合计入库重量（吨）：{{ inWeight }}</div>
-                    <div style="text-align:right;margin-right:60px;">合计出库重量（吨）：{{ outWeight }}</div>
-                    <div style="text-align:right;margin-right:40px;">合计入库数量（个）：{{ inCount }}</div>
-                    <div style="text-align:right;margin-right:20px;">合计出库数量（个）：{{ outCount }}</div>
+                <el-col :span="18" style="text-align:right;">
+                    <div style="display:flex;align-items:center;flex-direction: row-reverse;">
+                        <el-button @click="excelOpen" >导出</el-button>
+                        <div style="text-align:right;margin-right:20px;">合计出库数量（个）：{{ outCount }}</div>
+                        <div style="text-align:right;margin-right:40px;">合计入库数量（个）：{{ inCount }}</div>
+                        <div style="text-align:right;margin-right:60px;">合计出库重量（吨）：{{ outWeight }}</div>
+                        <div style="text-align:right;margin-right:80px;">合计入库重量（吨）：{{ inWeight }}</div>
+                        
+                        
+                        
+                        
+                    </div>
+                    
                 </el-col>
             </el-row>
             <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="500"
@@ -75,6 +83,18 @@
                 <el-table-column prop="netWeight" label="净重（公斤）" width="150"></el-table-column>
                 <el-table-column prop="carNo" label="车牌号" width="150"></el-table-column>
                 <el-table-column prop="materialQuantity" label="数量（个）" width="100"></el-table-column>
+                <el-table-column prop="deliveryMethod" label="备注" width="100">
+                    <template scope="scope">
+                        <el-popover
+                        placement="bottom"
+                        title="备注"
+                        width="200"
+                        trigger="click"
+                        :content="scope.row.remark">
+                            <el-button slot="reference">查看</el-button>
+                        </el-popover>
+                    </template>
+                </el-table-column>
                 <el-table-column label="经办人" width="200">
                     <template scope="scope">
                         <span v-if="scope.row.grossAgent == scope.row.tareAgent"> {{ scope.row.grossAgent }}</span>
@@ -84,7 +104,7 @@
                 <el-table-column prop="status" label="状态"></el-table-column>
                 <el-table-column prop="inOutWarehouseDate" label="出入库日期">
                     <template scope="scope">
-                        <span>{{ scope.row.inOutWarehouseDate.split(" ")[0] }}</span>
+                        <span>{{ scope.row.inOutWarehouseDate }}</span>
                     </template>
                 </el-table-column>
                 <!-- <el-table-column label="操作"  width="200">
@@ -146,16 +166,70 @@
                 <el-button @click="typePrintCannelClick1">取消</el-button>
             </div>
         </div> -->
+        <div class="mask" v-show="isShowPrintType"></div>
+    <div class="print-type" v-show="isShowPrintType">
+      <div class="print-type-content">
+        <div class="print-type-title">导出记录</div>
+        <div class="print-type-checkbox">
+          <el-form ref="form" label-width="110px">
+            <el-form-item label="类型">
+              <el-radio-group v-model="parameter.inOutFlag">
+                <el-radio :label="3">入库记录</el-radio>
+                <el-radio :label="2">出库记录</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="起始日期">
+              <el-date-picker type="datetime" @change="startDataChange" format="yyyy-MM-dd HH:mm:ss"  value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择起始日期" v-model="parameter.startDate"  default-time="00:00:00"></el-date-picker>
+              <!-- <el-date-picker v-model="value3" type="datetime" placeholder="选择日期时间" default-time="12:00:00"></el-date-picker> -->
+            </el-form-item>
+            <el-form-item label="截止日期">
+              <el-date-picker type="datetime" @change="endDataChange" format="yyyy-MM-dd HH:mm:ss"  value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择截止日期" v-model="parameter.endDate"  default-time="00:00:00">
+              </el-date-picker>
+            </el-form-item>
+              <!-- <el-form-item label="截止日期1">
+              <el-date-picker value-format="timestamp" type="date" placeholder="请选择截止日期" v-model="parameter.endDate1">
+              </el-date-picker>
+            </el-form-item> -->
+            <!--仓库名称-->
+            <el-form-item label="仓库名称" span="1" prop="warehouseName">
+               
+              <el-select @change="warehousechange" v-model="parameter.baseId" placeholder="请选择仓库名称" filterable clearable>
+                 <el-option  key="" label="全部仓库" value="全部仓库" />
+                <el-option  v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
+                                :value="item.id" />
+              </el-select>
+            </el-form-item>
+
+            <!-- <el-form-item label="增量比例（%）" v-if="headerText == '打印记录'">
+              <el-input placeholder="请输入增量比例" v-model="parameter.proportion" clearable class="proportion_css">
+              </el-input>
+            </el-form-item> -->
+          </el-form>
+        </div>
+      </div>
+      <div class="bottom-btn">
+        <el-button @click="exportexcel()">确定</el-button>
+        <el-button @click="removePrint">取消</el-button>
+      </div>
+    </div>
     </div>
 </template>
 <script>
 import {
     // delMaterial,
-    getMaterialRecord
+    getMaterialRecord,
+    postExportMaterial
 } from '@/model/warehouse/index'
+import {
+  downloadFile
+} from '@/utils/batchDown'
 import {
     selectWarehouseSelf,
 } from '@/model/outboundManagement/index'
+import {
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
 export default {
     data() {
         return {
@@ -163,13 +237,16 @@ export default {
             warehouseId: '',
             warehouseName: '',
             warehouseName1: '',
-
+            isShowPrintType:false,
             compId: '',
             inOutFlag: '',
             //分页
             currentPage: 1,
             pageSize: 10,
             value2: '',
+            parameter:{
+                compId: localStorage.getItem('ws-pf_compId'),
+            },
             deptCircularPage: {},
             deptBudgetTotal: 0,
             warehouseList: [], //仓库
@@ -303,6 +380,10 @@ export default {
             printSeparately: false,
             onePrint: false,
             dialogDataList: [],
+            date: {
+                year: dayjs().format('YYYY'),
+                month: dayjs().format('MM'),
+            },
             printData: {
             }
         }
@@ -453,6 +534,47 @@ export default {
         this.getList()
     },
     methods: {
+        removePrint() {
+        this.parameter = {
+                compId: localStorage.getItem('ws-pf_compId'),
+            }
+        this.isShowPrintType = false
+      },
+        excelOpen(){
+            this.isShowPrintType=true
+
+        },
+        downloadFile(url, fileName){ 
+        //fileurl文件地址（一般是接口返回） filename文件下载后的名字
+        const x = new XMLHttpRequest()
+        x.open('GET', url, true)
+        x.responseType = 'blob'
+        x.onload = function() {
+          const url = window.URL.createObjectURL(x.response)
+          const a = document.createElement('a')
+          a.href = url
+          a.download = fileName
+          a.click()
+          document.body.removeChild(a);
+          // 然后移除
+        }
+        x.send()
+      },
+        async exportexcel() {
+      const 
+        data
+       = await postExportMaterial({
+        compId: localStorage.getItem('ws-pf_compId'),
+        baseId: this.warehouseId,
+        inOutFlag: this.inOutFlag,
+        startDate: this.startDate,
+        endDate: this.endDate,
+      }).toPromise()
+      console.log(data)
+      this.downloadFile(data.data.data, `${
+            this.date.year + (this.date.month ? `-${this.date.month}` : '')
+          }物料导出记录`)
+    },
         inOutChange(num) {
             this.inOutFlag = num
             this.getList()
@@ -943,4 +1065,69 @@ export default {
         align-items: center;
     }
 }
+
+.mask {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 99;
+    opacity: 0.3;
+  }
+
+  .count {
+    text-align: center;
+    margin-bottom: 10px;
+  }
+
+  .print-type {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 340px;
+    height: 346px;
+    background: white;
+    border-radius: 10px;
+    z-index: 999;
+
+    .bottom-btn {
+      text-align: center;
+    }
+  }
+
+  .print-type-title {
+    text-align: center;
+    font-size: 18px;
+    // margin: 20px;
+    margin: 20px 20px 10px;
+  }
+
+  .print-type-checkbox {
+    padding-left: 20px;
+
+    .el-date-editor.el-input {
+      width: 85% !important;
+    }
+
+    .proportion_css {
+      width: 85%;
+    }
+  }
+  /deep/.print-type{
+
+  }
+  /deep/.print-type .el-radio__label{
+    font-size:12px;
+  }
+  /deep/.print-type .el-form-item{
+    display: flex;
+    align-items: center;
+    .el-form-item__content{
+        margin:0 !important;
+    }
+  }
 </style>

src/views/warehousenew/materialInOutWarehouse.vue

@@ -108,40 +108,49 @@
                 <div class="left1">
                   <div class="weightInfo">
                     <ws-info-table>
-                      <ws-form-item label="物料名称" span="1" prop="itemName">
+                      <el-form-item label="物料名称" span="1" prop="itemName">
                         <ws-input @mousewheel.native.prevent v-model="materialList.itemName" placeholder="请输入物料名称"
                           maxlength="10" size="small" :disabled="recheck" />
-                      </ws-form-item>
-                      <ws-form-item label="车牌号" span="1" prop="carNo" v-show="materialList.deliveryMethod == '1'">
+                      </el-form-item>
+                      <el-form-item label="车牌号" span="1" prop="carNo" v-show="materialList.deliveryMethod == '1'">
                         <ws-input @mousewheel.native.prevent v-model="materialList.carNo" placeholder="请输入车牌号"
                           maxlength="7" size="small" :disabled="recheck" />
-                      </ws-form-item>
-                      <ws-form-item label="毛重(KG)" span="1" prop="grossWeight"
+                      </el-form-item>
+                      <el-form-item label="毛重(KG)" span="1" prop="grossWeight"
                         v-show="grossShow && materialList.deliveryMethod == '1'">
                         <ws-input type="number" @mousewheel.native.prevent v-model="materialList.grossWeight"
                           @input="calculation" placeholder="自动获取" maxlength="100" size="small"
                           :disabled="disabled || grossDisabled" />
                         <el-button v-if="tpyeNo == 2" @click="openPort">
                           重新获取</el-button>
-                      </ws-form-item>
-                      <ws-form-item label="皮重(KG)" span="1" prop="tare"
+                      </el-form-item>
+                      <el-form-item label="皮重(KG)" span="1" prop="tare"
                         v-show="tareShow && materialList.deliveryMethod == '1'">
                         <ws-input type="number" @mousewheel.native.prevent v-model="materialList.tare"
                           @input="calculation" placeholder="自动获取" maxlength="100" size="small"
                           :disabled="disabled || tareDisabled" />
                         <el-button v-if="tpyeNo == 1" @click="openPort">
                           重新获取</el-button>
-                      </ws-form-item>
-                      <ws-form-item label="净重(KG)" span="1" prop="tare"
+                      </el-form-item>
+                      <el-form-item label="净重(KG)" span="1" prop="tare"
                         v-show="netWeightShow && materialList.deliveryMethod == '1'">
                         <ws-input type="number" @mousewheel.native.prevent v-model="materialList.netWeight"
                           @input="calculation" placeholder="自动计算" maxlength="100" size="small" disabled />
-                      </ws-form-item>
-                      <ws-form-item label="数量" span="1" prop="materialQuantity"
+                      </el-form-item>
+                      <el-form-item label="数量" span="1" prop="materialQuantity"
                         v-show="materialList.deliveryMethod == '3'">
                         <ws-input type="number" @mousewheel.native.prevent v-model="materialList.materialQuantity"
                           placeholder="请输入数量" maxlength="10" size="small" />
-                      </ws-form-item>
+                      </el-form-item>
+                      <el-form-item label="日期" span="1" prop="itemName">
+                        <el-date-picker value-format="yyyy-MM-dd" v-model="materialList.inOutWarehouseDate" type="date" placeholder="选择日期">
+                        </el-date-picker>
+                      </el-form-item>
+                      <el-form-item class="remarkWrap" label="备注" span="1" prop="itemName">
+                        <el-input @mousewheel.native.prevent v-model="materialList.remark" placeholder="请输入物料名称"
+                          maxlength="10" type="textarea" :disabled="recheck" />
+                          
+                      </el-form-item>
                     </ws-info-table>
                     <div class="but">
                       <el-button @click="submit" type="primary">提交</el-button>
@@ -898,6 +907,8 @@ export default {
                 this.$set(this.materialList, 'tare', '')
                 this.$set(this.materialList, 'netWeight', '')
                 this.$set(this.materialList, 'materialQuantity', '')
+                this.$set(this.materialList, 'inOutWarehouseDate', '')
+                this.$set(this.materialList, 'remark', '')
                 this.getList()
               })
           } else if ((this.inOutFlag == 1 && this.tpyeNo == 2) || (this.inOutFlag == 2 && this.tpyeNo == 1)) {//出库称毛+入库称皮
@@ -914,6 +925,8 @@ export default {
                 this.$set(this.materialList, 'tare', '')
                 this.$set(this.materialList, 'netWeight', '')
                 this.$set(this.materialList, 'materialQuantity', '')
+                this.$set(this.materialList, 'inOutWarehouseDate', '')
+                this.$set(this.materialList, 'remark', '')
                 lookMaterial({ id: this.materialList.id }).toPromise()
                   .then((response) => {
                     this.printData = response
@@ -1586,4 +1599,10 @@ export default {
     align-items: center;
   }
 }
+/deep/.ws-info-table .remarkWrap.el-form-item .el-form-item__content {
+  height:auto;
+}
+/deep/.ws-info-table .remarkWrap.el-form-item .el-form-item__content .el-textarea__inner{
+  width:100%;
+}
 </style>

src/views/warehousenew/warehouseManagementList.vue

@@ -261,7 +261,7 @@
                 <el-option v-for="item in typeList" :key="item.id" :label="item.binNumber" :value="item.binNumber" />
               </el-select>
             </el-form-item>
-            <el-form-item v-if='compName=="辽宁佳屹农商贸有限公司"' label="货名" span="1" prop="warehouseName">
+            <el-form-item v-if='compName=="辽宁佳屹农商贸有限公司"&&headerText!="导出记录"' label="货名" span="1" prop="warehouseName">
               <el-select v-model="parameter.goodsName" placeholder="请选择货名" filterable clearable >
                 <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
               :value="item.constValue" />
@@ -331,7 +331,9 @@
     deletewarehouse,
     postInWeight,
     getwarehousNameNew,
-    getbintype
+    getbintype,
+    postExportjynin, 
+    postExportjynout
   } from '@/model/warehouse/index'
   import mapDrag from '@/components/mapdrag/warehouseMap'
   import {
@@ -454,6 +456,22 @@
           
         }
         
+      },
+      downloadFile(url, fileName){ 
+        //fileurl文件地址（一般是接口返回） filename文件下载后的名字
+        const x = new XMLHttpRequest()
+        x.open('GET', url, true)
+        x.responseType = 'blob'
+        x.onload = function() {
+          const url = window.URL.createObjectURL(x.response)
+          const a = document.createElement('a')
+          a.href = url
+          a.download = fileName
+          a.click()
+          document.body.removeChild(a);
+          // 然后移除
+        }
+        x.send()
       },
        //导出、打印EndDate
       outData(index) {
@@ -515,39 +533,65 @@
         this.isShowPrintType = false
         if (this.headerText == '导出记录') {
           if (this.parameter.radio == 3) {
-            const {
-              data
-            } = await postExport({
-              startDate: this.parameter.printStartDate,
-              endDate: this.parameter.printEndDate,
-              warehouseName: this.parameter.warehouseName,
-            }, {}, {
-              responseType: 'blob'
-            }).toPromise()
-            downloadFile({
-              res: data,
-              fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }导出入库记录`,
-              type: 'xls',
-            })
+            if(this.compName=="辽宁佳屹农商贸有限公司"){
+               const data= await postExportjynin({
+                compId: localStorage.getItem('ws-pf_compId'),
+                startDate: this.parameter.printStartDate,
+                endDate: this.parameter.printEndDate,
+                warehouseName: this.parameter.warehouseName,
+              }).toPromise()
+              console.log(data)
+              // window.open(data.data.data)
+              this.downloadFile(data.data.data, `${
+            this.date.year + (this.date.month ? `-${this.date.month}` : '')
+          }导出出库记录`)
+            }else{
+              const {data} = await postExport({
+                startDate: this.parameter.printStartDate,
+                endDate: this.parameter.printEndDate,
+                warehouseName: this.parameter.warehouseName,
+              }, {}, {
+                responseType: 'blob'
+              }).toPromise()
+              downloadFile({
+                res: data,
+                fileName: `${
+            this.date.year + (this.date.month ? `-${this.date.month}` : '')
+          }导出入库记录`,
+                type: 'xls',
+              })
+            }
+            
           } else if (this.parameter.radio == 2) {
-            const {
-              data
-            } = await postExportOut({
-              startDate: this.parameter.printStartDate,
-              endDate: this.parameter.printEndDate,
-              warehouseName: this.parameter.warehouseName,
-            }, {}, {
-              responseType: 'blob'
-            }).toPromise()
-            downloadFile({
-              res: data,
-              fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }导出出库记录`,
-              type: 'xls',
-            })
+            if(this.compName=="辽宁佳屹农商贸有限公司"){
+              
+              const data= await postExportjynout({
+                compId: localStorage.getItem('ws-pf_compId'),
+                startDate: this.parameter.printStartDate,
+                endDate: this.parameter.printEndDate,
+                warehouseName: this.parameter.warehouseName,
+              }).toPromise()
+              console.log(data)
+              this.downloadFile(data.data.data, `${
+            this.date.year + (this.date.month ? `-${this.date.month}` : '')
+          }导出出库记录`)
+            }else{
+              const {data} = await postExportOut({
+                startDate: this.parameter.printStartDate,
+                endDate: this.parameter.printEndDate,
+                warehouseName: this.parameter.warehouseName,
+              }, {}, {
+                responseType: 'blob'
+              }).toPromise()
+              downloadFile({
+                res: data,
+                fileName: `${
+            this.date.year + (this.date.month ? `-${this.date.month}` : '')
+          }导出出库记录`,
+                type: 'xls',
+              })
+            }
+            
           }
         } else if (this.headerText == '打印记录') {
           if(this.parameter.binNumber=='全部合营'){

src/views/warehousenew/warehouseManagementRecord.vue

@@ -13,7 +13,10 @@
     <div class="center">
       <h2 style="padding-left: 20px">
         <img style="position: relative; top: 2px" width="19" height="19" src="../../../public/img/cangku.png" alt="" />
-        <span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
+        <!-- <span style="color: #323233">{{ deptBudgetList.warehouseName }}</span> -->
+        <el-select @change="warehousechange" v-model="deptBudgetList.baseId" placeholder="请选择仓库名称" filterable clearable>
+            <el-option v-for="item in warehouseAllXiaLa" :key="item.warehouseName" :label="item.warehouseName" :value="item.id" />
+        </el-select>
         <div class="ware" v-show="warehouseType==1">
           <!-- {{binNumber}}仓位(容量{{capacity}}吨) -->
           <span class="binNo">仓位号：</span>
@@ -368,7 +371,8 @@
     getbinnumber,
     getExpense,
     getReceiptTaskNo,
-    salestraninfo
+    salestraninfo,
+    getwarehousNameNew
   } from '@/model/warehouse/index'
   import {
     downloadFile
@@ -474,6 +478,7 @@
         accessoryTFs: false,
         modification: [],
         printList: [], //批量打印数据
+        warehouseAllXiaLa:[]
       }
     },
 
@@ -485,6 +490,18 @@
       // this.binNumber = this.$route.query.binNumber
       this.capacity = this.$route.query.capacity
       this.warehouseType = this.$route.query.warehouseType
+      getwarehousNameNew({
+        compId: localStorage.getItem('ws-pf_compId')
+      })
+      .toPromise()
+      .then((response) => {
+        for(var tmp = 0 ; tmp < response.length ; tmp++){
+          if(response[tmp].warehouseType == '2'){
+            response[tmp].warehouseName = response[tmp].warehouseName + ' （临）'
+          }
+        }
+        this.warehouseAllXiaLa = response
+      })
       this.getList()
       // this.getPassYearFormatDate()
       this.showType = this.isShow
@@ -495,6 +512,9 @@
       })
     },
     methods: {
+      warehousechange(){
+        this.getList()
+      },
       onSubmit(){
         if(!this.currectdata.taskNoNew){
           this.$message.error("合同/移库编号不能为空！")
@@ -758,6 +778,7 @@
 				// this.onChangeFlag = true
 			},
 			getList() {
+        
 					var startDate=''
 					var endDate=''
 					if(this.value2){
@@ -829,6 +850,7 @@
 							this.deptBudgetTotal = response.total
 							this.warehouseList = response
 						})
+            
 				}
         getReceiptTaskNo({
             flag: 1,