修改留学

quasar.conf.js

@@ -47,8 +47,7 @@ module.exports = function (ctx) {
       vueRouterMode: 'hash', // available values: 'hash', 'history'
 
       env: ctx.dev ? {
-        // API: 'http://localhost:5001/api',
-        API: 'http://192.168.10.65:8085/api',
+        API: 'http://localhost:5001/api',
         // API: 'http://192.168.20.24:8300/api',
         // API: 'http://192.168.10.46:8300/api',
 

src/pages/studyAbroad/employment.vue

@@ -31,6 +31,13 @@
               <q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
                 :icon="props.row.expand ? 'remove' : 'add'" />
             </q-td>
+            
+            <q-td key="ProductTypeName" :props="props" style="width:100px;">
+              {{props.row.ProductTypeName}}
+            </q-td>
+            <q-td key="Name" :props="props" style="width:100px;">
+              {{props.row.Name}}
+            </q-td>
             <q-td key="SaleStateName">
               <template v-if="props.row.SaleState==1">
                 {{props.row.SaleStateName}}
@@ -40,12 +47,6 @@
                   {{props.row.SaleStateName}}</a>
               </template>
             </q-td>
-            <q-td key="ProductTypeName" :props="props" style="width:100px;">
-              {{props.row.ProductTypeName}}
-            </q-td>
-            <q-td key="Name" :props="props" style="width:100px;">
-              {{props.row.Name}}
-            </q-td>
             <q-td key="SupplierName" :props="props">
               <div>{{props.row.SupplierName}}</div>
               <div>
@@ -310,11 +311,6 @@
             label: '备注',
             field: 'Remark',
             align: 'left'
-          },  {
-            name: 'SaleStateName',
-            label: '销售状态',
-            field: 'SaleStateName',
-            align: 'left'
           }, 
           {
             name: 'ProductTypeName',
@@ -327,6 +323,12 @@
             label: '项目名称',
             field: 'Name',
             align: 'left'
+          },
+           {
+            name: 'SaleStateName',
+            label: '销售状态',
+            field: 'SaleStateName',
+            align: 'left'
           },
           {
             name: 'SupplierName',

src/pages/studyAbroad/studyabroad.vue

@@ -31,12 +31,22 @@
               <q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
                 :icon="props.row.expand ? 'remove' : 'add'" />
             </q-td>
+            
             <q-td key="ProductTypeName" :props="props" style="width:100px;">
               {{props.row.ProductTypeName}}
             </q-td>
             <q-td key="Name" :props="props" style="width:100px;">
               {{props.row.Name}}
             </q-td>
+            <q-td key="SaleStateName">
+              <template v-if="props.row.SaleState==1">
+                {{props.row.SaleStateName}}
+              </template>
+              <template v-if="props.row.SaleState!=1">
+                <a style="cursor:pointer;color:blue;" @click="ShowInfo(props.row)" title="点击查看审核信息">
+                  {{props.row.SaleStateName}}</a>
+              </template>
+            </q-td>
             <q-td key="SupplierName" :props="props">
               <div>{{props.row.SupplierName}}</div>
               <div>
@@ -184,15 +194,7 @@
                 <div class="remark-font">暂无佣金信息</div>
               </div>
             </q-td> -->
-            <q-td key="SaleStateName">
-              <template v-if="props.row.SaleState==1">
-                {{props.row.SaleStateName}}
-              </template>
-              <template v-if="props.row.SaleState!=1">
-                <a style="cursor:pointer;color:blue;" @click="ShowInfo(props.row)" title="点击查看审核信息">
-                  {{props.row.SaleStateName}}</a>
-              </template>
-            </q-td>
+         
             <q-td key="Id" style="width:200px;">
               <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
                 @click="EditStudy(props.row)" />
@@ -321,6 +323,12 @@
             label: '项目名称',
             field: 'Name',
             align: 'left'
+          },
+           {
+            name: 'SaleStateName',
+            label: '销售状态',
+            field: 'SaleStateName',
+            align: 'left'
           },
           {
             name: 'SupplierName',
@@ -466,12 +474,7 @@
           //   align: "left",
           //   field: row => row.PreferentialList
           // },
-          {
-            name: 'SaleStateName',
-            label: '销售状态',
-            field: 'SaleStateName',
-            align: 'left'
-          },
+         
           {
             name: 'Id',
             label: '操作',