Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/basicData/container/index.vue

@@ -42,7 +42,7 @@
               size="small"
               type="primary"
               @click.stop="openReport()"
-            >报 表
+            >报表打印
             </el-button>
           </template>
           <report-dialog

src/views/basicData/customerInformation/index.vue

@@ -51,7 +51,7 @@
                   size="small"
                   type="primary"
                   @click.stop="openReport()"
-                  >报 表
+                  >报表打印
                 </el-button>
               </template>
               <template slot-scope="scope" slot="menu">

src/views/basicData/customerManagement/companyMaterial/index.vue

@@ -51,7 +51,7 @@
                   size="small"
                   type="primary"
                   @click.stop="openReport()"
-                  >报 表
+                  >报表打印
                 </el-button>
               </template>
               <template slot-scope="scope" slot="menu">

src/views/basicData/customerManagement/supplierMaterial/index.vue

@@ -51,7 +51,7 @@
                   size="small"
                   type="primary"
                   @click.stop="openReport()"
-                  >报 表
+                  >报表打印
                 </el-button>
               </template>
               <template slot-scope="scope" slot="menu">

src/views/basicData/factoryInformation/factoryInformation/index.vue

@@ -51,7 +51,7 @@
                   size="small"
                   type="primary"
                   @click.stop="openReport()"
-                  >报 表
+                  >报表打印
                 </el-button>
               </template>
               <template slot-scope="scope" slot="menu">

src/views/basicData/fleetInformation/index.vue

@@ -51,7 +51,7 @@
                   size="small"
                   type="primary"
                   @click.stop="openReport()"
-                  >报 表
+                  >报表打印
                 </el-button>
               </template>
               <template slot-scope="scope" slot="menu">

src/views/basicData/landTransportation/vehicleInformation/index.vue

@@ -114,7 +114,7 @@ export default {
               res: 'data'
             },
             tip: '请上传 .xls,.xlsx 标准格式文件',
-            action: "/blade-client/land-vehicle/import-data"
+            action: "/api/blade-client/land-vehicle/import-data"
           }
         ]
       },

src/views/basicData/portinformation/index.vue

@@ -42,7 +42,7 @@
               size="small"
               type="primary"
               @click.stop="openReport()"
-            >报 表
+            >报表打印
             </el-button>
           </template>
           <report-dialog

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -190,7 +190,7 @@
                          v-if="goodsActives == 'gift'"
               >录入明细
               </el-button>
-              <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()">报 表</el-button>
+              <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()">报表打印</el-button>
               <el-button
                 type="warning"
                 icon="el-icon-refresh"

src/views/businessManagement/deliveryNotice/index.vue

@@ -28,7 +28,7 @@
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" icon="el-icon-printer":loading="exportLoading"
-                     @click.stop="statement">报 表</el-button>
+                     @click.stop="statement">报表打印</el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orgOrderNo }}</span>

src/views/businessManagement/inventoryAccount/index.vue

@@ -51,7 +51,7 @@
             size="small"
             :loading="exportLoading"
             @click.stop="statement"
-          >报 表
+          >报表打印
           </el-button>
         </template>
       </avue-crud>

src/views/businessManagement/purchaseOrder/index.vue

@@ -25,7 +25,7 @@
                  :cell-style="cellStyle">
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" icon="el-icon-copy-document" @click="copyOrder" :disabled="single">复制单据</el-button>
-          <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
+          <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
           <el-button type="warning" :size="size" icon="el-icon-thumb" :disabled="multiple" @click="applyPayment">申请货款</el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -183,7 +183,7 @@
                          :disabled="detailData.seeDisabled || receiveDisabled"
               >录入明细
               </el-button>
-              <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
+              <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
             </template>
           </avue-crud>
         </basic-container>

src/views/businessManagement/receipt/index.vue

@@ -27,7 +27,7 @@
                  :cell-style="cellStyle">
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
-          <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
+          <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orgOrderNo }}</span>

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -402,7 +402,7 @@
                          icon="el-icon-printer"
                          @click.stop="openReport()"
                          v-show="goodsActives == 'goods'"
-              >报 表</el-button>
+              >报表打印</el-button>
               <el-button
                 type="primary"
                 size="small"
@@ -1275,8 +1275,8 @@ export default {
       basicData: {
         column: [
           {
-            label: '客户全称',
-            prop: 'corpId',
+            label: '所属公司',
+            prop: 'belongToCorpId',
             span: 8,
             rules: [
               {
@@ -1286,9 +1286,8 @@ export default {
               }
             ]
           }, {
-            label: '到货地址',
-            prop: 'arrivalAddress',
-            span:16,
+            label: '付款方式',
+            prop: 'paymentType',
             rules: [
               {
                 required: true,
@@ -1296,10 +1295,9 @@ export default {
                 trigger: 'change'
               }
             ]
-          }, {
-            label: '生产工厂',
-            prop: 'productionPlant',
-            span: 8,
+          },{
+            label: '包装要求',
+            prop: 'packageRemarks',
             rules: [
               {
                 required: true,
@@ -1309,10 +1307,9 @@ export default {
             ]
           },
           {
-            label: '发货地址',
-            prop: 'shippingAddress',
-            disabled: false,
-            span: 16,
+            label: '客户全称',
+            prop: 'corpId',
+            span: 8,
             rules: [
               {
                 required: true,
@@ -1321,9 +1318,9 @@ export default {
               }
             ]
           }, {
-            label: '所属公司',
-            prop: 'belongToCorpId',
-            span: 8,
+            label: '到货地址',
+            prop: 'arrivalAddress',
+            span:16,
             rules: [
               {
                 required: true,
@@ -1332,8 +1329,9 @@ export default {
               }
             ]
           }, {
-            label: '付款方式',
-            prop: 'paymentType',
+            label: '生产工厂',
+            prop: 'productionPlant',
+            span: 8,
             rules: [
               {
                 required: true,
@@ -1341,9 +1339,12 @@ export default {
                 trigger: 'change'
               }
             ]
-          },{
-            label: '包装要求',
-            prop: 'packageRemarks',
+          },
+          {
+            label: '发货地址',
+            prop: 'shippingAddress',
+            disabled: false,
+            span: 16,
             rules: [
               {
                 required: true,

src/views/businessManagement/salesOrder/index.vue

@@ -61,7 +61,7 @@
         </template>
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="success" :size="size" @click="copyOrder" :disabled="single">复制单据</el-button>
-          <el-button type="info" :size="size" icon="el-icon-printer">报 表</el-button>
+          <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
           <el-button
             type="info"
             size="small"

src/views/dealer/purchase/detail.vue

@@ -119,7 +119,7 @@
               icon="el-icon-printer"
               size="small"
               @click.stop="openReport()"
-            >报 表</el-button>
+            >报表打印</el-button>
             <el-button
               type="primary"
               size="small"

src/views/dealer/sales/detail.vue

@@ -140,7 +140,7 @@
               icon="el-icon-printer"
               size="small"
               @click.stop="openReport"
-            >报 表</el-button>
+            >报表打印</el-button>
             <el-button
               type="primary"
               size="small"

src/views/dealer/stock/index.vue

@@ -59,7 +59,7 @@
             size="small"
             :loading="exportLoading"
             @click.stop="statement"
-          >报 表
+          >报表打印
           </el-button>
         </template>
       </avue-crud>

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -267,7 +267,7 @@
               icon="el-icon-printer"
               size="small"
               @click.stop="openReport()"
-              >报 表</el-button
+              >报表打印</el-button
             >
             <el-button
               type="info"

src/views/exportTrade/customerInquiry/index.vue

@@ -94,7 +94,7 @@
             :disabled="selectionList.length != 1"
             >复制单据</el-button
           >
-          <el-button type="info" size="small">报表</el-button>
+          <el-button type="info" size="small">报表打印</el-button>
         </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>

src/views/exportTrade/invoice/detailsPage.vue

@@ -114,7 +114,7 @@
               icon="el-icon-printer"
               size="small"
               @click.stop="openReport()"
-              >报 表</el-button
+              >报表打印</el-button
             >
           </template>
           <template slot-scope="{ row }" slot="corpId">

src/views/exportTrade/invoice/index.vue

@@ -92,7 +92,7 @@
             :disabled="selectionList.length != 1"
             >复制单据</el-button
           >
-          <el-button type="info" size="small">报表</el-button>
+          <el-button type="info" size="small">报表打印</el-button>
         </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -186,7 +186,7 @@
                 icon="el-icon-printer"
                 size="small"
                 @click.stop="openReport()"
-                >报 表</el-button
+                >报表打印</el-button
               >
               <el-button
                 type="warning"

src/views/exportTrade/purchaseContract/index.vue

@@ -47,7 +47,7 @@
             :disabled="selectionList.length != 1"
             >复制单据</el-button
           >
-          <el-button type="info" size="small">报表</el-button>
+          <el-button type="info" size="small">报表打印</el-button>
         </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -211,7 +211,7 @@
               icon="el-icon-printer"
               size="small"
               @click.stop="openReport()"
-              >报 表</el-button
+              >报表打印</el-button
             >
           </template>
           <template slot="menu" slot-scope="{ row, index }">

src/views/exportTrade/purchaseInquiry/index.vue

@@ -36,7 +36,7 @@
             :disabled="selectionList.length != 1"
             >复制单据</el-button
           >
-          <el-button type="info" size="small">报表</el-button>
+          <el-button type="info" size="small">报表打印</el-button>
         </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>

src/views/exportTrade/receipt/detailsPage.vue

@@ -104,7 +104,7 @@
               icon="el-icon-printer"
               size="small"
               @click.stop="openReport()"
-              >报 表</el-button
+              >报表打印</el-button
             >
           </template>
           <template slot="taxRate" slot-scope="{ row }">

src/views/exportTrade/receipt/index.vue

@@ -36,7 +36,7 @@
             :disabled="selectionList.length != 1"
             >复制单据</el-button
           >
-          <el-button type="info" size="small">报表</el-button>
+          <el-button type="info" size="small">报表打印</el-button>
         </template>
         <template slot-scope="{ row }" slot="storageId">
           <span>{{ row.storageName }}</span>

src/views/exportTrade/salesContract/detailsPage.vue

@@ -484,7 +484,7 @@
                 icon="el-icon-printer"
                 size="small"
                 @click.stop="openReport()"
-                >报 表</el-button
+                >报表打印</el-button
               >
               <el-button
                 type="warning"

src/views/exportTrade/salesContract/index.vue

@@ -54,7 +54,7 @@
             :disabled="selectionList.length != 1"
             >复制单据</el-button
           >
-          <el-button type="info" size="small">报表</el-button>
+          <el-button type="info" size="small">报表打印</el-button>
         </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>

src/views/exportTrade/shippingInquiry/index.vue

@@ -19,7 +19,7 @@
         @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="menuLeft">
-          <el-button type="info" size="small">报表</el-button>
+          <el-button type="info" size="small">报表打印</el-button>
         </template>
         <template slot="portOfLoadSearch">
           <port-info v-model="search.portOfLoad" />

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -33,7 +33,7 @@
         <el-button size="small"
                    type="info"
                    @click.stop="openReport()"
-        >报表
+        >报表打印
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">

src/views/landTransportation/placeAnOrder/index.vue

@@ -121,7 +121,7 @@
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="primary" icon="el-icon-plus" :size="size" @click="rowSave">创建单据</el-button>
           <el-button type="success" :size="size">复制单据</el-button>
-          <el-button type="info" :size="size" icon="el-icon-printer">报表</el-button>
+          <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
         </template>
         <template slot="corpNameSearch" slot-scope="{ row,index}">
           <crop-select

src/views/maintenance/priceLibrary/index.vue

@@ -35,7 +35,7 @@
             @click="derivation()"
             >下载模板
           </el-button>
-          <el-button type="info" size="small">报表</el-button>
+          <el-button type="info" size="small">报表打印</el-button>
         </template>
         <template slot="cnameSearch">
           <goods-select

src/views/maintenance/priceManagement/index.vue

@@ -82,7 +82,7 @@
             type="info"
             icon="el-icon-printer"
             size="small"
-        >报 表
+        >报表打印
         </el-button>
       </template>
     </avue-crud>

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -120,7 +120,7 @@
               size="small"
               :disabled="!form.id"
               @click.stop="openReport()"
-              >报 表</el-button
+              >报表打印</el-button
             >
           </template>
           <template slot="basicsSalaryLabel">

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -120,7 +120,7 @@
               size="small"
               :disabled="!form.id"
               @click.stop="openReport()"
-              >报 表</el-button
+              >报表打印</el-button
             >
           </template>
           <template slot="basicsSalaryLabel">

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -120,7 +120,7 @@
               size="small"
               :disabled="!form.id"
               @click.stop="openReport()"
-              >报 表</el-button
+              >报表打印</el-button
             >
           </template>
           <template slot="basicsSalaryLabel">

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -120,7 +120,7 @@
               size="small"
               :disabled="!form.id"
               @click.stop="openReport()"
-              >报 表</el-button
+              >报表打印</el-button
             >
           </template>
           <template slot="basicsSalaryLabel">

src/views/saleLeads/detail.vue

@@ -101,7 +101,7 @@
               type="info"
               icon="el-icon-printer"
               size="small"
-            >报 表</el-button>
+            >报表打印</el-button>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
             <el-button

src/views/statisticAnalysis/royalty/index.vue

@@ -43,7 +43,7 @@
         <el-button size="small"
                    type="primary"
                    @click.stop="statement"
-        >报表
+        >报表打印
         </el-button>
       </template>
     </avue-crud>

src/views/workManagement/handoverSheet/detail.vue

@@ -101,7 +101,7 @@
               type="info"
               icon="el-icon-printer"
               size="small"
-            >报 表</el-button>
+            >报表打印</el-button>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
             <el-button

src/views/workManagement/purchaseApply/config/commodity.json

@@ -15,7 +15,7 @@
   "selection": true,
   "tip": false,
   "column": [{
-      "label": "商品编号",
+      "label": "物料编号",
       "prop": "code",
       "index": 1,
       "width": 120,
@@ -24,7 +24,7 @@
       "overHidden": true
     },
     {
-      "label": "商品名称",
+      "label": "物料名称",
       "search": true,
       "searchSpan": 8,
       "prop": "cname",
@@ -47,34 +47,6 @@
       "index": 4,
       "width": 120,
       "overHidden": true
-    },
-    {
-      "label": "花纹",
-      "prop": "brandItem",
-      "index": 5,
-      "width": 120,
-      "overHidden": true
-    },
-    {
-      "label": "负荷指数",
-      "prop": "specsOne",
-      "index": 6,
-      "width": 120,
-      "overHidden": true
-    },
-    {
-      "label": "速级",
-      "prop": "specsTwo",
-      "index": 7,
-      "width": 120,
-      "overHidden": true
-    },
-    {
-      "label": "加强型",
-      "prop": "level",
-      "index": 8,
-      "width": 120,
-      "overHidden": true
     }
   ]
 }

src/views/workManagement/purchaseApply/detail.vue

@@ -118,7 +118,7 @@
               type="info"
               icon="el-icon-printer"
               size="small"
-            >报 表</el-button>
+            >报表打印</el-button>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
             <el-button
@@ -415,6 +415,12 @@ export default {
         labelWidth: 100,
         column: [
           {
+            label: "系统号",
+            prop: "sysNo",
+            span: 6,
+            disabled: true
+          },
+          {
             label: "申请人",
             prop: "applyUser",
             rules: [
@@ -424,7 +430,7 @@ export default {
                 trigger: "change"
               }
             ],
-            span: 8,
+            span: 6,
             slot: true,
           },
           {
@@ -437,13 +443,13 @@ export default {
                 trigger: "change"
               }
             ],
-            span: 8,
+            span: 6,
             slot: true,
           },
           {
             label: "申请时间",
             prop: "applyTime",
-            span: 8,
+            span: 6,
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd 00:00:00",
@@ -456,12 +462,6 @@ export default {
             ]
           },
           {
-            label: "系统号",
-            prop: "sysNo",
-            span: 8,
-            disabled: true
-          },
-          {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",

src/views/workManagement/purchaseApply/index.vue

@@ -165,6 +165,14 @@ export default {
         current: page.currentPage,
         tradeType: 'OCG',
       })
+      if (queryParams.applyTime && queryParams.applyTime.length > 0) {
+        queryParams = {
+          ...queryParams,
+          beginApplyTime: queryParams.applyTime[0] + ' 00:00:00',
+          endApplyTime: queryParams.applyTime[1] + ' 23:59:59',
+        }
+      }
+      delete queryParams.applyTime;
       this.loading = true;
       getList(queryParams).then(res => {
         this.dataList = res.data.data.records;

src/views/workManagement/receipt/statisticalList.vue

@@ -34,7 +34,7 @@
           type="primary"
           :loading="exportLoading"
           @click.stop="statement"
-        >报表
+        >报表打印
         </el-button>
       </template>
       <template slot="cornIdSearch">

src/views/workManagement/requisition/config/commodity.json

@@ -1,7 +1,8 @@
 {
   "stripe": true,
   "border": true,
-  "searchMenuSpan": 16,
+  "searchMenuSpan": 8,
+  "searchSpan": 8,
   "searchIcon": true,
   "searchIndex": 2,
   "index": true,
@@ -14,66 +15,82 @@
   "menuWidth": "180",
   "selection": true,
   "tip": false,
-  "column": [{
-      "label": "商品编号",
-      "prop": "code",
+  "column": [
+    {
+      "label": "入库日期",
+      "prop": "inDate",
       "index": 1,
-      "width": 120,
+      "minWidth": 80,
+      "overHidden": true,
+      "format": "yyyy-MM",
+      "valueFormat": "yyyy-MM",
+      "unlinkPanels": true,
+      "searchRange": true,
       "search": true,
-      "searchSpan": 8,
-      "overHidden": true
+      "type": "month"
     },
     {
-      "label": "商品名称",
-      "search": true,
-      "searchSpan": 8,
+      "label": "物料名称",
       "prop": "cname",
+      "search": true,
       "index": 2,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
-      "label": "商品类别",
-      "prop": "goodsTypeName",
+      "label": "物料编号",
+      "prop": "code",
+      "search": false,
       "index": 3,
-      "width": 120,
-      "search": true,
-      "searchSpan": 8,
+      "minWidth": 80,
       "overHidden": true
     },
     {
-      "label": "规格尺寸",
-      "prop": "typeno",
+      "label": "期初",
+      "prop": "opening",
+      "search": false,
       "index": 4,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
-      "label": "花纹",
-      "prop": "brandItem",
+      "label": "入库",
+      "prop": "inQuantity",
+      "search": false,
       "index": 5,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
-      "label": "负荷指数",
-      "prop": "specsOne",
+      "label": "出库",
+      "prop": "outQuantity",
+      "search": false,
       "index": 6,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
-      "label": "速级",
-      "prop": "specsTwo",
+      "label": "结余",
+      "prop": "balanceQuantity",
+      "search": false,
       "index": 7,
-      "width": 120,
+      "minWidth": 80,
       "overHidden": true
     },
     {
-      "label": "加强型",
-      "prop": "level",
+      "label": "单价",
+      "prop": "unitPrice",
+      "search": false,
       "index": 8,
-      "width": 120,
+      "minWidth": 80,
+      "overHidden": true
+    },
+    {
+      "label": "金额",
+      "prop": "amount",
+      "search": false,
+      "index": 9,
+      "minWidth": 80,
       "overHidden": true
     }
   ]

src/views/workManagement/requisition/detail.vue

@@ -117,7 +117,7 @@
               type="info"
               icon="el-icon-printer"
               size="small"
-            >报 表</el-button>
+            >报表打印</el-button>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
             <el-button
@@ -241,6 +241,7 @@
               v-model="row.storageId"
               filterable
               clearable
+              @change="storageChange(row)"
             >
               <el-option
                 v-for="(item, index) in storageOptions"
@@ -278,36 +279,21 @@
       v-dialog-drag
     >
       <span>
-        <el-row>
-          <el-col :span="4">
-            <div>
-              <el-scrollbar>
-                <basic-container>
-                  <avue-tree
-                    :option="treeOption"
-                    @node-click="nodeClick"
-                    :style="treeStyle"
-                  />
-                </basic-container>
-              </el-scrollbar>
-            </div>
-          </el-col>
-          <el-col :span="20">
-            <avue-crud
-              :option="goodsOption"
-              :table-loading="loading"
-              :data="goodsListShow"
-              ref="goodsCrud"
-              :search.sync="search"
-              @search-change="searchChange"
-              @selection-change="selectionChange"
-              @row-click="rowClick"
-              :page.sync="page"
-              @on-load="onLoad"
-              @saveColumn="saveGoodsColumn"
-              @resetColumn="resetGoodsColumn"
-              :cell-style="cellStyle"
-            >
+        <avue-crud
+          :option="goodsOption"
+          :table-loading="loading"
+          :data="goodsListShow"
+          ref="goodsCrud"
+          :search.sync="search"
+          @search-change="searchChange"
+          @selection-change="selectionChange"
+          @row-click="rowClick"
+          :page.sync="page"
+          @on-load="onLoad"
+          @saveColumn="saveGoodsColumn"
+          @resetColumn="resetGoodsColumn"
+          :cell-style="cellStyle"
+        >
               <template slot="menuLeft">
                 <el-tabs v-model="activeName" @tab-click="tabHandle">
                   <el-tab-pane label="查询结果" name="searchList"></el-tab-pane>
@@ -334,8 +320,6 @@
                 </el-button>
               </template>
             </avue-crud>
-          </el-col>
-        </el-row>
       </span>
 
       <span slot="footer" class="dialog-footer">
@@ -408,6 +392,7 @@ import { contrastObj, contrastList } from "@/util/contrastData";
 import check from "@/components/check/check";
 import checkSchedule from "@/components/check/checkSchedule";
 import {customerList as storageList} from "@/api/basicData/basicStorageDesc";
+import {getStockList} from "@/api/officeSupplies/stock";
 
 export default {
   name: "detail",
@@ -802,9 +787,21 @@ export default {
     },
     //商品查询
     onLoad(page, params = {}) {
-      let obj = this.deepClone(Object.assign(params, this.search));
+      let queryParams = Object.assign({}, params, {
+        size: page.pageSize,
+        current: page.currentPage,
+        tradeType: 'BGYP',
+      })
+      if (queryParams.inDate && queryParams.inDate.length > 0) {
+        queryParams = {
+          ...queryParams,
+          beginInDate: queryParams.inDate[0],
+          endInDate: queryParams.inDate[1],
+        }
+      }
+      delete queryParams.inDate;
       this.loading = true;
-      getGoods(page.currentPage, page.pageSize, this.treeDeptId, obj)
+      getStockList(queryParams)
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;
@@ -885,14 +882,14 @@ export default {
           this.selectionList.forEach(e => {
             this.dataList.forEach(async (item, index) => {
               if (index == this.reData.index) {
-                item.itemId = e.id;
+                item.itemId = e.goodsId;
                 item.code = e.code;
                 item.cname = e.cname;
                 item.corpId = e.corpId;
                 item.corpName = e.corpName;
                 item.unit = e.unit;
                 item.priceCategory = e.goodsTypeName;
-                item.price = e.price;
+                item.price = e.unitPrice;
                 item.$cellEdit = true;
               }
             });
@@ -902,23 +899,24 @@ export default {
         if (this.goodsListSave.length > 0) { // 暂存的有数据
           this.goodsListSave.forEach(async e => {
             this.dataList.push({
-              itemId: e.id,
+              itemId: e.goodsId,
               code: e.code,
               cname: e.cname,
               corpId: e.corpId,
               corpName: e.corpName,
               unit: e.unit,
-              price: e.price,
+              price: e.unitPrice,
               amount: 0,
               orderQuantity: 0,
               storageId: this.storageOptions.length > 0? this.storageOptions[0].id: null,
+              storageName: this.storageOptions.length > 0? this.storageOptions[0].cname: null,
               $cellEdit: true
             });
           });
         } else {
           this.selectionList.forEach(async e => {
             this.dataList.push({
-              itemId: e.id,
+              itemId: e.goodsId,
               code: e.code,
               cname: e.cname,
               corpId: e.corpId,
@@ -926,8 +924,9 @@ export default {
               unit: e.unit,
               amount: 0,
               orderQuantity: 0,
-              price: e.price,
+              price: e.unitPrice,
               storageId: this.storageOptions.length > 0? this.storageOptions[0].id: null,
+              storageName: this.storageOptions.length > 0? this.storageOptions[0].cname: null,
               $cellEdit: true
             });
           });
@@ -986,6 +985,9 @@ export default {
         })
       }
     },
+    storageChange(row) {
+      this.$set(row, 'storageName', this.storageOptions.find(item => item.id == row.storageId).cname);
+    },
   },
 }
 </script>

src/views/workManagement/requisition/index.vue

@@ -154,6 +154,14 @@ export default {
         current: page.currentPage,
         tradeType: 'OLY',
       })
+      if (queryParams.applyTime && queryParams.applyTime.length > 0) {
+        queryParams = {
+          ...queryParams,
+          beginApplyTime: queryParams.applyTime[0] + ' 00:00:00',
+          endApplyTime: queryParams.applyTime[1] + ' 23:59:59',
+        }
+      }
+      delete queryParams.applyTime;
       this.loading = true;
       getList(queryParams).then(res => {
         this.dataList = res.data.data.records;

src/views/workManagement/service-items/project.vue

@@ -43,7 +43,7 @@
               size="small"
               type="primary"
               @click.stop="openReport()"
-            >报 表
+            >报表打印
             </el-button>
           </template>
           <report-dialog

src/views/workManagement/warehousing/config/commodity.json

@@ -15,16 +15,16 @@
   "selection": true,
   "tip": false,
   "column": [{
-      "label": "商品编号",
-      "prop": "code",
-      "index": 1,
-      "width": 120,
-      "search": true,
-      "searchSpan": 8,
-      "overHidden": true
-    },
+    "label": "物料编号",
+    "prop": "code",
+    "index": 1,
+    "width": 120,
+    "search": true,
+    "searchSpan": 8,
+    "overHidden": true
+  },
     {
-      "label": "商品名称",
+      "label": "物料名称",
       "search": true,
       "searchSpan": 8,
       "prop": "cname",
@@ -47,34 +47,6 @@
       "index": 4,
       "width": 120,
       "overHidden": true
-    },
-    {
-      "label": "花纹",
-      "prop": "brandItem",
-      "index": 5,
-      "width": 120,
-      "overHidden": true
-    },
-    {
-      "label": "负荷指数",
-      "prop": "specsOne",
-      "index": 6,
-      "width": 120,
-      "overHidden": true
-    },
-    {
-      "label": "速级",
-      "prop": "specsTwo",
-      "index": 7,
-      "width": 120,
-      "overHidden": true
-    },
-    {
-      "label": "加强型",
-      "prop": "level",
-      "index": 8,
-      "width": 120,
-      "overHidden": true
     }
   ]
 }

src/views/workManagement/warehousing/detail.vue

@@ -114,7 +114,7 @@
               type="info"
               icon="el-icon-printer"
               size="small"
-            >报 表</el-button>
+            >报表打印</el-button>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
             <el-button
@@ -238,6 +238,7 @@
               v-model="row.storageId"
               filterable
               clearable
+              @change="storageChange(row)"
             >
               <el-option
                 v-for="(item, index) in storageOptions"
@@ -567,6 +568,12 @@ export default {
         this.oldForm = {...this.form};
         this.oldDataList = [...this.dataList];
         delete this.form.orderItemsList;
+        this.dataList.forEach(item => {
+          if (!item.storageId) {
+            this.$set(item, 'storageId', this.storageOptions.length > 0? this.storageOptions[0].id: null);
+            this.$set(item, 'storageName', this.storageOptions.length > 0? this.storageOptions[0].cname: null);
+          }
+        })
         if (!this.form.stockUser) {
           getUserInfo().then(res => {
             this.$set(this.form, 'stockUser', res.data.data.id);
@@ -864,6 +871,7 @@ export default {
               amount: 0,
               orderQuantity: 0,
               storageId: this.storageOptions.length > 0? this.storageOptions[0].id: null,
+              storageName: this.storageOptions.length > 0? this.storageOptions[0].cname: null,
               $cellEdit: true
             });
           });
@@ -880,6 +888,7 @@ export default {
               orderQuantity: 0,
               price: e.price,
               storageId: this.storageOptions.length > 0? this.storageOptions[0].id: null,
+              storageName: this.storageOptions.length > 0? this.storageOptions[0].cname: null,
               $cellEdit: true
             });
           });
@@ -928,7 +937,10 @@ export default {
         this.btnLoading = false;
       })
     },
-  },
+    storageChange(row) {
+      this.$set(row, 'storageName', this.storageOptions.find(item => item.id == row.storageId).cname);
+    },
+   },
 }
 </script>
 

src/views/workManagement/warehousing/index.vue

@@ -129,6 +129,14 @@ export default {
         current: page.currentPage,
         tradeType: 'ORK',
       })
+      if (queryParams.stockTime && queryParams.stockTime.length > 0) {
+        queryParams = {
+          ...queryParams,
+          beginStockTime: queryParams.stockTime[0] + ' 00:00:00',
+          endStockTime: queryParams.stockTime[1] + ' 23:59:59',
+        }
+      }
+      delete queryParams.stockTime;
       this.loading = true;
       getList(queryParams).then(res => {
         this.dataList = res.data.data.records;