Browse Source

修改bug

qukaidi 2 years ago
parent
commit
436f7c8b16

+ 1 - 1
src/views/purchasingManagement/inStock/config/customerContact.json

@@ -167,7 +167,7 @@
     },
     {
       "index": 18,
-      "prop": "qRCode",
+      "prop": "qrCode",
       "label": "二维码",
       "overHidden": true,
       "width": 100

+ 24 - 9
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,6 +57,18 @@
               @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)"
@@ -66,9 +80,10 @@
         </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">
@@ -388,7 +403,7 @@ export default {
         this.buttonLoading = false
       })
     },
-    beforeFinance(feesData,callback){
+    beforeFinance(feesData, callback) {
       let params = {}
       //暂时默认通过  之后优化
       params.valid = true

+ 1 - 1
src/views/salesManagement/outStock/config/customerContact.json

@@ -167,7 +167,7 @@
     },
     {
       "index": 18,
-      "prop": "qRCode",
+      "prop": "qrCode",
       "label": "二维码",
       "overHidden": true,
       "width": 100

+ 13 - 1
src/views/salesManagement/outStock/detailsPage.vue

@@ -57,6 +57,18 @@
               @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)"
@@ -430,7 +442,7 @@ export default {
           }).finally(() => {
             this.buttonLoading = false
           })
-        }else{
+        } else {
           this.$confirm("此订单余额不足,是否继续确认提交审核?", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",