Merge remote-tracking branch 'origin/dev' into dev

src/views/InventoryManagement/inventory/index.vue

@@ -237,7 +237,15 @@ export default {
                 });
         },
         onLoad2(page, params) {
+            if (this.search2.stockTime && this.search2.stockTime.length > 0) {
+                params = {
+                    ...params,
+                    createStartTime: this.search.stockTime[0] + ' ' + "00:00:00",
+                    createEndTime: this.search.stockTime[1] + ' ' + "23:59:59"
+                };
+            }
             let data = this.deepClone(Object.assign({}, params, this.search2));
+            delete data.stockTime;
             data.billType = "RK"
             this.loading2 = true;
             getList(page.currentPage, page.pageSize, data)

src/views/basicData/agreement/detailsPage.vue

@@ -20,12 +20,12 @@
             <crop-select v-model="form.corpId" corpType="KH" :refresh="false" @getCorpData="getCorpData"
               :disabled="detailData.status == 1"></crop-select>
           </template>
-          <template slot="warehouseId">
+          <!-- <template slot="warehouseId">
             <el-cascader v-model="form.warehouseId" :options="storagetreeList" :show-all-levels="false"
               :disabled="detailData.status == 1"
               :props="{ checkStrictly: true, emitPath: false, label: 'title',multiple: true }" clearable>
             </el-cascader>
-          </template>
+          </template> -->
         </avue-form>
       </basic-container>
       <containerTitle title="基础明细"></containerTitle>
@@ -152,19 +152,20 @@ export default {
               value: "id"
             },
             dicData: [],
+            multiple: true,
             span: 6,
           },
           {
             label: "仓库",
             prop: "warehouseId",
-            // type: "cascader",
-            // dataType: "string",
-            // dicData: [],
-            // props: {
-            //   label: 'title',
-            //   value: 'id'
-            // },
-            // multiple: true,
+            type: "cascader",
+            dataType: "string",
+            dicData: [],
+            props: {
+              label: 'title',
+              value: 'id'
+            },
+            multiple: true,
             span: 6,
           },
           {
@@ -241,7 +242,7 @@ export default {
       this.findObject(this.option.column, "billSdtatus").dicData = res.data.data;
     });
     getStoragetree().then(res => {
-      this.storagetreeList = res.data.data;
+      this.findObject(this.option.column, "warehouseId").dicData = res.data.data;
     })
     getAllgoodstype().then(res => {
       this.findObject(this.option.column, "goodsId").dicData =
@@ -268,9 +269,9 @@ export default {
       this.loadingBtn=true
       getDetail(id)
         .then(res => {
-          if (res.data.data.warehouseId) {
-            res.data.data.warehouseId = res.data.data.warehouseId.split(',')
-          }
+          // if (res.data.data.warehouseId) {
+          //   res.data.data.warehouseId = res.data.data.warehouseId.split(',')
+          // }
           this.form = res.data.data;
           this.dataList = res.data.data.agreementitemsList;
           this.orderFilesList = res.data.data.orderFilesList
@@ -323,17 +324,16 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          if (this.form.warehouseId) {
-            console.log(this.form.warehouseId)
-            this.form.warehouseId = this.form.warehouseId.join(',')
-          }
+          // if (this.form.warehouseId) {
+          //   this.form.warehouseId = this.form.warehouseId.join(',')
+          // }
           this.loadingBtn = true;
           submit({ ...this.form, agreementitemsList: this.dataList })
             .then(res => {
               this.$message.success("保存成功");
-              if (res.data.data.data.warehouseId) {
-                res.data.data.data.warehouseId = res.data.data.data.warehouseId.split(',')
-              }
+              // if (res.data.data.data.warehouseId) {
+              //   res.data.data.data.warehouseId = res.data.data.data.warehouseId.split(',')
+              // }
               console.log()
               this.form = res.data.data.data;
               this.dataList = res.data.data.data.agreementitemsList;

src/views/financing/financingManagement/index.vue

@@ -18,11 +18,11 @@
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
-        <template slot="financingDateSearch">
+        <!-- <template slot="financingDateSearch">
           <el-date-picker v-model="search.financingDate" type="daterange" start-placeholder="开始日期"
             end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
-        </template>
+        </template> -->
         <template slot-scope="{ row, index }" slot="menu">
           <el-button type="text" size="small" :disabled="row.status>0"  @click.stop="rowDel(row, index)">
             删除
@@ -74,6 +74,18 @@ export default {
     });
     this.option.height = window.innerHeight - 210;
   },
+  activated() {
+        setTimeout(() => {
+            if (this.$route.query.check && this.show) {
+              console.log(this.$route.query.check)
+                // this.detailData = {
+                //     id: this.$route.query.check
+                // }
+                this.editOpen(this.$route.query.check.srcBillId,1)
+                this.show = false;
+            }
+        }, 100);
+    },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {

src/views/financing/financingManagement/js/optionList.js

@@ -27,9 +27,9 @@ export const option ={
     {
       label: "融资日期",
       prop: "financingDate",
-      type: "date",
-      format: 'yyyy-MM-dd',
-      valueFormat: 'yyyy-MM-dd',
+      type: "month",
+      format: 'yyyy-MM',
+      valueFormat: 'yyyy-MM-01 00:00:00',
       search: true,
       searchSpan: 8,
     },

src/views/purchasingManagement/inStock/config/customerContact.json

@@ -38,6 +38,11 @@
       "name": "balanceMoney",
       "type": "sum",
       "decimals": 2
+    },
+    {
+      "name": "storageAmount",
+      "type": "sum",
+      "decimals": 2
     }
   ],
   "column": [
@@ -228,6 +233,7 @@
       "prop": "storageAmount",
       "label": "入库金额",
       "overHidden": true,
+      "cell": true,
       "width": 100
     },
     {

src/views/purchasingManagement/inStock/config/mainList.json

@@ -14,6 +14,19 @@
   "searchIndex": 2,
   "selection": true,
   "tip": false,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "storageQuantity",
+      "type": "sum",
+      "decimals": 3
+    },
+    {
+      "name": "storageAmount",
+      "type": "sum",
+      "decimals": 2
+    }
+  ],
   "column": [
     {
       "label": "货权人",

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -106,8 +106,12 @@
       <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="detailData.status == 1"
         feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :optionType="'CMY'" :itemType="'C'"
         :inCropId="true" :tabShow="3" @beforeFinance="beforeFinance" :delType="2" :billingShow="false" />
-      <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
-        delUrl="" />
+      <!-- <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
+        delUrl="" /> -->
+      <containerTitle title="上传附件"></containerTitle>
+      <c-upload typeUpload="CD" deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="orderFilesList" display
+        :enumerationValue="85.6" :disabled="detailData.status == 1"></c-upload>
+
       <el-dialog append-to-body title="审核进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
         :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
         <check-schedule :checkId="form.id" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
@@ -551,14 +555,14 @@ export default {
       window.open(`/api/trade-purchase/woodHarvestingCloud/export-template?${this.website.tokenHeader}=${getToken()}`)
     },
     uploadAfter(res, done, loading, column) {
-      if (!res.message){
+      if (!res.message) {
         res.forEach(item => this.itemsVOList.push({
           ...item,
           $cellEdit: true
         }))
         this.excelBox = false
         done();
-      }else {
+      } else {
         loading()
       }
     },

src/views/purchasingManagement/inStock/index.vue

@@ -11,9 +11,11 @@
                     </el-button>
                 </template>
                 <template slot-scope="{ row,index}" slot="menu">
-                    <el-button type="text" icon="el-icon-plus" size="small" :disabled="row.status!=3"  @click.stop="generate(row, index)">生成出库单
+                    <el-button type="text" icon="el-icon-plus" size="small" :disabled="row.status!=3"
+                        @click.stop="generate(row, index)">生成出库单
                     </el-button>
-                    <el-button type="text" icon="el-icon-delete" size="small" :disabled="row.status>0" @click.stop="rowDel(row, index)">删除
+                    <el-button type="text" icon="el-icon-delete" size="small" :disabled="row.status>0"
+                        @click.stop="rowDel(row, index)">删除
                     </el-button>
                 </template>
                 <template slot="stockTimeSearch">
@@ -138,7 +140,15 @@ export default {
             this.page.pageSize = val;
         },
         onLoad(page, params) {
+            if (this.search.stockTime && this.search.stockTime.length > 0) {
+                params = {
+                    ...params,
+                    createStartTime: this.search.stockTime[0]+' '+"00:00:00",
+                    createEndTime: this.search.stockTime[1]+' '+"23:59:59"
+                };
+            }
             let data = this.deepClone(Object.assign({}, params, this.search));
+            delete data.stockTime;
             data.billType = "RK"
             this.loading = true;
             getList(page.currentPage, page.pageSize, data)
@@ -159,8 +169,8 @@ export default {
         generate(row) {
             this.$router.push({
                 path: "/salesManagement/outStock/index",
-                query:{
-                    generateId:row.id
+                query: {
+                    generateId: row.id
                 }
             });
         },

src/views/salesManagement/outStock/config/customerContact.json

@@ -28,6 +28,11 @@
       "name": "price",
       "type": "sum",
       "decimals": 2
+    },
+    {
+      "name": "storageAmount",
+      "type": "sum",
+      "decimals": 2
     }
   ],
   "column": [
@@ -234,6 +239,7 @@
       "prop": "storageAmount",
       "label": "出库金额",
       "overHidden": true,
+      "cell": true,
       "width": 100
     },
     {

src/views/salesManagement/outStock/config/mainList.json

@@ -15,6 +15,19 @@
   "searchIndex": 2,
   "selection": true,
   "tip": false,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "storageQuantity",
+      "type": "sum",
+      "decimals": 3
+    },
+    {
+      "name": "storageAmount",
+      "type": "sum",
+      "decimals": 2
+    }
+  ],
   "column": [
     {
       "label": "货权人",

src/views/salesManagement/outStock/detailsPage.vue

@@ -106,8 +106,12 @@
       <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="detailData.status == 1"
         feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :optionType="'CMY'" :itemType="'D'"
         :inCropId="true" :tabShow="2" @beforeFinance="beforeFinance" :delType="2" :billingShow="false" />
-      <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
-        delUrl="" />
+      <!-- <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
+        delUrl="" /> -->
+      <containerTitle title="上传附件"></containerTitle>
+      <c-upload typeUpload="CD" deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="orderFilesList" display
+        :enumerationValue="85.6" :disabled="detailData.status == 1"></c-upload>
+
       <el-dialog append-to-body title="审核进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
         :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
         <check-schedule :checkId="form.id" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">

src/views/salesManagement/outStock/index.vue

@@ -84,6 +84,13 @@ export default {
                 // this.detailData.id = this.$route.query.generateId
                 this.show = false;
             }
+            if (this.$route.query.check && this.show) {
+                // this.detailData = {
+                //     id: this.$route.query.check
+                // }
+                this.editOpen(this.$route.query.check.srcBillId,1)
+                this.show = false;
+            }
         }, 100);
     },
     methods: {
@@ -140,7 +147,15 @@ export default {
             this.page.pageSize = val;
         },
         onLoad(page, params) {
+            if (this.search.stockTime && this.search.stockTime.length > 0) {
+                params = {
+                    ...params,
+                    createStartTime: this.search.stockTime[0]+' '+"00:00:00",
+                    createEndTime: this.search.stockTime[1]+' '+"23:59:59"
+                };
+            }
             let data = this.deepClone(Object.assign({}, params, this.search));
+            delete data.stockTime;
             data.billType = "CK"
             this.loading = true;
             getList(page.currentPage, page.pageSize, data)