qymljy 2 лет назад
Родитель
Сommit
7e4e9b9266

+ 1 - 1
src/SManagement/user/pay-orders/index.vue

@@ -85,9 +85,9 @@ export default {
       this.listData()
       let that = this
       this.$refs.payment.dialogVisible = true
+      this.$refs.payment.queryCode(orderno)
       this.$refs.payment.queryAccount(id)
       this.$refs.payment.queryData(id)
-      this.$refs.payment.queryCode(orderno)
       this.payChangeFun(function(a) {
         a.result  = () => {
           that.$refs.payment.dialogVisible = false

+ 14 - 2
src/SManagement/user/pay-orders/modules/add.vue

@@ -18,7 +18,7 @@
           <span>选择版本:</span>
         </el-col>
         <el-col :span="10" class="div_top">
-          <el-table
+<!--          <el-table
               :data="versionList"
               height="300px"
               :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}"
@@ -31,13 +31,23 @@
                 >
             </el-table-column>
             <el-table-column
+                prop="operation"
                 label="操作"
                 width="120">
               <template slot-scope="scope">
                 <input type="radio" :checked="scope.row.checkRow" @click="onCheck(scope.row)"></input>
               </template>
             </el-table-column>
-          </el-table>
+          </el-table>-->
+          <tableLayout :layout="tablecolsVersion" :data="versionList"  :opwidth="200" :custom="true"  height="370px" fixedName="operation" @rowClick="rowClick">
+            <template v-slot:customcol="scope">
+              <span v-if="scope.column.columnname === 'operation'" ></span>
+              <p v-else>{{scope.column.data[scope.column.columnname] || '--'}}</p>
+            </template>
+            <template v-slot:opreation="scope">
+              <input type="radio" :checked="scope.data.checkRow" @click="onCheck(scope.data)"></input>
+            </template>
+          </tableLayout>
         </el-col>
         <el-col :span="14" class="div_top">
           <el-table
@@ -143,6 +153,7 @@ export default {
       },
       tablecolsAccount:[],
       tablecolsMain:[],
+      tablecolsVersion:[],
       list:[],
       param:{
         "classname": "system.payorder.payorder",
@@ -315,6 +326,7 @@ export default {
   created() {
     this.tablecolsAccount = this.tool.tabelCol(this.$route.name).accountTable.tablecols
     this.tablecolsMain = this.tool.tabelCol(this.$route.name).mainBodyTable.tablecols
+    this.tablecolsVersion = this.tool.tabelCol(this.$route.name).versionTable.tablecols
   }
 }
 </script>

+ 1 - 1
src/SManagement/user/pay-orders/modules/payment.vue

@@ -16,7 +16,7 @@
             </el-col>
             <el-col :span="6" class="div_span_top">
               <span>付费状态:
-                <span v-if="list.ispaid == '0'" style="color: red">未付费</span>
+                <span v-if="list.ispaid == '0' || list.ispaid == '2'" style="color: red">未付费</span>
                 <span v-else>已付费</span>
               </span>
             </el-col>