Merge branch 'dev' into 预订查询

@@ -87,13 +87,15 @@
               </div>
               </div>
             </el-col>
             </el-col>
             <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
             <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
-              <span class="text-warning"> {{ b.payType != '2' ? '¥' : '€' }}
+              <span class="text-warning"> {{ b.payType != '2' || !b.totalPayAmount ? '¥' : '€' }}
                 <span class="bigMoney">{{ b.totalPayAmount || b.totalAmount }}</span>
                 <span class="bigMoney">{{ b.totalPayAmount || b.totalAmount }}</span>
               </span>
               </span>
             </el-col>
             </el-col>
             <el-col :lg="6" :md="16" :sm="16" :xs="16">
             <el-col :lg="6" :md="16" :sm="16" :xs="16">
               <div class="text-right">
               <div class="text-right">
-                <el-button v-if="b.isInvoice == '0'&&!b.invoiceId" plain round type="primary" @click.stop="gokp(b)">
+                <el-button v-if="b.isInvoice == '0'&&!b.invoiceId" :disabled="!b.totalPayAmount||b.totalAmount==0" plain
+                           round type="primary"
+                           @click.stop="gokp(b)">
                   {{ language == 0 ? '申请开票' : 'Invoice' }}
                   {{ language == 0 ? '申请开票' : 'Invoice' }}
                 </el-button>
                 </el-button>
                 <el-button v-if="b.isInvoice == '0'&&b.invoiceId" plain round type="primary" @click.stop="editkp(b)">
                 <el-button v-if="b.isInvoice == '0'&&b.invoiceId" plain round type="primary" @click.stop="editkp(b)">
@@ -322,7 +324,7 @@ const handleClick = (e) => {
 
 
 }
 }
 const gokp = (item) => {
 const gokp = (item) => {
-  if (query.value.orderType) {
+  if (query.value.orderType == 6) {
     router.push({
     router.push({
       name: 'ticketAddInvoice',
       name: 'ticketAddInvoice',
       query: {
       query: {

@@ -30,12 +30,14 @@
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item :label="language==0?'团体类型':'Group type'" prop="type">
         <el-form-item :label="language==0?'团体类型':'Group type'" prop="type">
-          <el-select :disabled="form.type=='4'" v-model="form.type" :placeholder="language==0?'请选择团体类型':''" style="width: 100%;">
+          <el-select  v-model="form.type" :placeholder="language==0?'请选择团体类型':''" style="width: 100%;">
             <el-option :label="language==0?'普通院校':'School'" value="0" />
             <el-option :label="language==0?'普通院校':'School'" value="0" />
             <el-option :label="language==0?'专业舞蹈学校':'Professional dance school'" value="1" />
             <el-option :label="language==0?'专业舞蹈学校':'Professional dance school'" value="1" />
             <el-option :label="language==0?'培训机构/俱乐部':'Company/Club'" value="2" />
             <el-option :label="language==0?'培训机构/俱乐部':'Company/Club'" value="2" />
             <el-option :label="language==0?'地方协会':'Local Association'" value="3" />
             <el-option :label="language==0?'地方协会':'Local Association'" value="3" />
-            <el-option :label="language==0?'国家协会':'National Association'" value="4" :disabled="form.type!='4'"/>
+            <el-option :label="language==0?'国家协会':'National Association'" value="4" />
+<!--   :disabled="form.type!='4'"-->
+
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item :label="language==0?'联系人姓名':'Contact Person'" required prop="contactPerson">
         <el-form-item :label="language==0?'联系人姓名':'Contact Person'" required prop="contactPerson">

@@ -272,7 +272,7 @@ function goPrev() {
 function submitForm() {
 function submitForm() {
   proxy.$refs['ruleFormRef'].validate((valid, fields) => {
   proxy.$refs['ruleFormRef'].validate((valid, fields) => {
     if (valid) {
     if (valid) {
-      if(form.value.type!='4'&&(form.value.abreviations=='')){
+      if(form.value.type!='4'&&(form.value.abreviations==''||!form.value.abreviations)){
         ElMessage.warning(language.value==0?`请输入参赛队名称`:`Please complete Name of participating team`)
         ElMessage.warning(language.value==0?`请输入参赛队名称`:`Please complete Name of participating team`)
         return
         return
       }
       }

@@ -71,7 +71,7 @@ export default defineConfig(({ mode, command }) => {
         },
         },
         '/dev-api/ztx-match': {
         '/dev-api/ztx-match': {
           // target: 'http://192.168.1.118:8083',
           // target: 'http://192.168.1.118:8083',
-          target: 'https://jijin.wtwuxicenter.com/stage-api',
+          target: 'https://wdsfwuxicenter.com/stage-api/',
           changeOrigin: true,
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
         },
         },
@@ -83,9 +83,9 @@ export default defineConfig(({ mode, command }) => {
         '/dev-api': {
         '/dev-api': {
           // target: 'http://192.168.1.118:8081/',
           // target: 'http://192.168.1.118:8081/',
           // target: 'http://192.168.1.131:8081/',
           // target: 'http://192.168.1.131:8081/',
-          // target: 'https://jijin.wtwuxicenter.com/stage-api',
+          target: 'https://jijin.wtwuxicenter.com/stage-api',
           // target: 'http://124.70.181.90:1880/stage-api',
           // target: 'http://124.70.181.90:1880/stage-api',
-          target: 'https://wdsfwuxicenter.com/stage-api/',
+          // target: 'https://wdsfwuxicenter.com/stage-api/',
           changeOrigin: true,
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },
         },