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

src/views/approveData/index.vue

@@ -200,7 +200,7 @@ export default {
     },
     openCheck(row) {
       if (row.checkType == 'CK') {
-        financingExcess({ id: this.form.id }).then(res => {
+        financingExcess({ id: row.corpId }).then(res => {
           if (res.data.data == '操作成功') {
             this.batch = false; //单条操作
             this.checkDialog = true;

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

@@ -8,7 +8,7 @@
   "addBtn": false,
   "delBtn": false,
   "headerAlign": "center",
-  "menuWidth": 150,
+  "menuWidth": 160,
   "refreshBtn": false,
   "showSummary": true,
   "column": [
@@ -167,12 +167,33 @@
     },
     {
       "index": 18,
-      "prop": "qRCode",
+      "prop": "qrCode",
       "label": "二维码",
       "overHidden": true,
       "width": 100
     },
     {
+      "index": 19,
+      "prop": "inventory",
+      "label": "盘点量",
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "index": 20,
+      "prop": "balanceNumber",
+      "label": "结余量",
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "index": 21,
+      "prop": "balanceMoney",
+      "label": "结余金额",
+      "overHidden": true,
+      "width": 100
+    },
+    {
       "index": 24,
       "prop": "remarks",
       "label": "备注",

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -7,8 +7,8 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button type="primary" size="small" :disabled="form.status>0" v-if="detailData.status == 1" class="el-button--small-yh "
-          @click.stop="openEdit">编辑
+        <el-button type="primary" size="small" :disabled="form.status>0" v-if="detailData.status == 1"
+          class="el-button--small-yh " @click.stop="openEdit">编辑
         </el-button>
         <el-button type="primary" @click="editCustomer" :loading="subLoading" v-if="detailData.status != 1"
           size="small">{{ form.id ? '修改数据' : '保存数据' }}
@@ -19,7 +19,8 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">审核数据</el-dropdown-item>
-            <el-dropdown-item :disabled="form.status<1" @click.native="checkScheduleDialog = true">审核进度</el-dropdown-item>
+            <el-dropdown-item :disabled="form.status<1" @click.native="checkScheduleDialog = true">审核进度
+            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
@@ -36,8 +37,9 @@
               :disabled="detailData.status == 1"></crop-select>
           </template>
           <template slot="storageId">
-            <el-cascader v-model="form.storageId" :options="storagetreeList" :show-all-levels="false" :disabled="detailData.status == 1"
-              :props="{ checkStrictly: true, emitPath: false, label: 'title' }" clearable @change="storagetreeChange">
+            <el-cascader v-model="form.storageId" :options="storagetreeList" :show-all-levels="false"
+              :disabled="detailData.status == 1" :props="{ checkStrictly: true, emitPath: false, label: 'title' }"
+              clearable @change="storagetreeChange">
             </el-cascader>
           </template>
         </avue-form>
@@ -55,20 +57,35 @@
               @click.stop="addRow">导入
             </el-button>
           </template>
+          <template slot="oneCode" slot-scope="{ row, index }">
+            <el-popover placement="right" width="160" trigger="click">
+              <el-image style="width: 160px; height: 80px" :src="row.oneCode" :fit="fit"></el-image>
+              <el-button v-if="row.oneCode" type="text" slot="reference">查看</el-button>
+            </el-popover>
+          </template>
+          <template slot="qrCode" slot-scope="{ row, index }">
+            <el-popover placement="right" width="300" trigger="click">
+              <el-image style="width: 300px; height: 300px" :src="row.qrCode" :fit="fit"></el-image>
+              <el-button v-if="row.qrCode" type="text" slot="reference">查看</el-button>
+            </el-popover>
+          </template>
           <template slot="menu" slot-scope="{ row, index }">
             <div style="display:flex;justify-content: center;">
               <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
                 :disabled="disabled || detailData.status == 1">{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
               <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
                 :disabled="detailData.status == 1">删除</el-button>
+              <el-button size="small" icon="el-icon-printer" type="text" @click="rowPrint(row, index)" :disabled="!row.id">
+                打印</el-button>
             </div>
           </template>
         </avue-crud>
       </trade-card>
       <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="" />
+        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="" />
       <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">
@@ -329,6 +346,9 @@ export default {
           this.pageLoading = false;
         });
     },
+    rowPrint(row){
+        this.$router.push(`/myiframe/urlPath?name=preview-木材管理-入库垛卡.ureport.xml&src=${this.website.reportUrl}/preview?_u=blade-木材管理-入库垛卡.ureport.xml&id=${row.id}`);
+    },
     //修改提交触发
     editCustomer(status) {
       this.$refs["form"].validate((valid, done) => {
@@ -388,7 +408,7 @@ export default {
         this.buttonLoading = false
       })
     },
-    beforeFinance(feesData,callback){
+    beforeFinance(feesData, callback) {
       let params = {}
       //暂时默认通过  之后优化
       params.valid = true

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

@@ -8,7 +8,7 @@
   "addBtn": false,
   "delBtn": false,
   "headerAlign": "center",
-  "menuWidth": 150,
+  "menuWidth": 160,
   "refreshBtn": false,
   "showSummary": true,
   "column": [
@@ -167,7 +167,7 @@
     },
     {
       "index": 18,
-      "prop": "qRCode",
+      "prop": "qrCode",
       "label": "二维码",
       "overHidden": true,
       "width": 100

src/views/salesManagement/outStock/detailsPage.vue

@@ -56,6 +56,19 @@
             <el-button type="info" icon="el-icon-top" size="small" :disabled="detailData.status == 1"
               @click.stop="addRow">导入
             </el-button>
+            <el-button type="info" icon="el-icon-printer" size="small" @click.stop="openReport()">报表打印</el-button>
+          </template>
+          <template slot="oneCode" slot-scope="{ row, index }">
+            <el-popover placement="right" width="160" trigger="click">
+              <el-image style="width: 160px; height: 80px" :src="row.oneCode" :fit="fit"></el-image>
+              <el-button v-if="row.oneCode" type="text" slot="reference">查看</el-button>
+            </el-popover>
+          </template>
+          <template slot="qrCode" slot-scope="{ row, index }">
+            <el-popover placement="right" width="300" trigger="click">
+              <el-image style="width: 300px; height: 300px" :src="row.qrCode" :fit="fit"></el-image>
+              <el-button v-if="row.qrCode" type="text" slot="reference">查看</el-button>
+            </el-popover>
           </template>
           <template slot="menu" slot-scope="{ row, index }">
             <div style="display:flex;justify-content: center;">
@@ -63,6 +76,8 @@
                 :disabled="disabled || detailData.status == 1">{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
               <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
                 :disabled="detailData.status == 1">删除</el-button>
+                <!-- <el-button size="small" icon="el-icon-printer" type="text" @click="rowPrint(row, index)" :disabled="!row.id">
+                打印</el-button> -->
             </div>
           </template>
         </avue-crud>
@@ -404,7 +419,7 @@ export default {
     },
     //请核
     auditCheck() {
-      financingExcess({ id: this.form.id }).then(res => {
+      financingExcess({ id: this.form.purchaserId }).then(res => {
         if (res.data.data == '操作成功') {
           this.$confirm("确定审核此订单?", {
             confirmButtonText: "确定",
@@ -430,7 +445,7 @@ export default {
           }).finally(() => {
             this.buttonLoading = false
           })
-        }else{
+        } else {
           this.$confirm("此订单余额不足，是否继续确认提交审核?", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -477,6 +492,9 @@ export default {
       params.parentId = this.form.id
       callback(params)
     },
+    openReport(){
+      this.$router.push(`/myiframe/urlPath?name=preview-木材库-出库单.ureport.xml&src=${this.website.reportUrl}/preview?_u=blade-木材库-出库单.ureport.xml&id=${this.form.id}`);
+    },
     async saveColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(191),