Parcourir la source

没有二维码时生成二维码

DESKTOP-B78GIPM\admin il y a 2 ans
Parent
commit
29d31d1d56

+ 2 - 2
src/views/settings/components/pos/modules/batchAddForm.vue

@@ -18,7 +18,7 @@
           </a-col> -->
                 <a-col :span="24">
                     <a-form-model-item label="pos类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="posTypeId">
-                        <a-select disabled v-model="model.posTypeId" placeholder="请选择pos类型">
+                        <a-select v-model="model.posTypeId" placeholder="请选择pos类型">
                             <a-select-option :value="item.id" v-for="item in posTypeList" :key="item.id">
                                 {{ item.name }}
                             </a-select-option>
@@ -188,7 +188,7 @@ export default {
         }).then((res) => {
             if (res.success) {
                 this.posTypeList = res.result.records;
-                this.model.posTypeId = this.posTypeList[0].id;
+                // this.model.posTypeId = this.posTypeList[0].id;
             }
         });
         getAction("/pos/posTableType/list", {

+ 19 - 4
src/views/settings/components/pos/posTable.vue

@@ -151,7 +151,7 @@ export default {
   data() {
     return {
       QRcodeVisible: false,
-      selectQRcode: "",
+      selectQRcode: null,
       queryParam: {},
       // 分页参数
       ipagination: {
@@ -234,9 +234,24 @@ export default {
   },
   methods: {
     QRcode(record){
-      console.log(record.qrCode);
-      this.selectQRcode = record.qrCode;
-      this.QRcodeVisible = true;
+      console.log(record);
+      this.selectQRcode = null;
+      if (record.qrCode) {
+        this.selectQRcode = record.qrCode;
+        this.QRcodeVisible = true;
+      }else{
+        getAction('/pos/posTable/generateQRCode?id=' + record.id).then((res) => {
+          console.log(res);
+          if (res.success) {
+            this.selectQRcode = res.result.qrCode;
+            this.QRcodeVisible = true;
+          }else{
+            this.$message.warning(res.message);
+          }
+        });
+      }
+      // this.selectQRcode = record.qrCode;
+      // this.QRcodeVisible = true;
     },
     batchAdd(){
       this.$refs.modalFormBatch.add();