页面修改

src/components/studyAbroad/studyproaudit-form.vue

@@ -150,7 +150,7 @@
           </div>
         </div>
         <div class="row">
-          <div class="col-6" v-if="isHaveViewSupplierAction">
+          <div class="col-12" v-if="isHaveViewSupplierAction">
             <div>供应商：{{saveObj.SupplierName}}
               <template v-if="isHaveViewContractAction">
                 <a v-if="saveObj.SupplierContract&&saveObj.SupplierContract!=''" :href="saveObj.SupplierContract"
@@ -161,7 +161,9 @@
               </template>
             </div>
           </div>
-          <div class="col-6">
+        </div>
+        <div class="row">
+          <div class="col-12">
             <span>状态：{{saveObj.SaleStateName}}</span>
           </div>
         </div>
@@ -340,8 +342,6 @@
           </div>
         </div>
       </template>
-
-
       <!--部门负责人审核-->
       <template v-if="saveObj.ManagerStatus>0">
         <div style="margin:20px;">
@@ -407,7 +407,6 @@
           </div>
         </div>
       </template>
-
     </q-card>
     <div class="dialog-out-close" @click="closeperForm"
       style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
@@ -461,7 +460,8 @@
     computed: mapState({
       //是否有查看合同权限
       isHaveViewContractAction(state) {
-        if (state.user.userInfo&&state.user.userInfo.ActionMenuList&&state.user.userInfo.ActionMenuList.length>0) {
+        if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
+          0) {
           let action = state.user.userInfo.ActionMenuList.find(x => {
             if (x.FunctionCode == "View_Supplier_Contract") {
               return x;
@@ -473,7 +473,8 @@
       },
       //是否有查看供应商权限
       isHaveViewSupplierAction(state) {
-        if (state.user.userInfo&&state.user.userInfo.ActionMenuList&&state.user.userInfo.ActionMenuList.length>0) {
+        if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
+          0) {
           let action = state.user.userInfo.ActionMenuList.find(x => {
             if (x.FunctionCode == "View_Supplier") {
               return x;

src/components/studyAbroad/studyproauditinfo-form.vue

@@ -150,9 +150,8 @@
             <span>创建时间：{{saveObj.CreateTimeStr}}</span>
           </div>
         </div>
-
         <div class="row">
-          <div class="col-6" v-if="isHaveViewSupplierAction">
+          <div class="col-12" v-if="isHaveViewSupplierAction">
             <div>供应商：{{saveObj.SupplierName}}
               <template v-if="isHaveViewContractAction">
                 <a v-if="saveObj.SupplierContract&&saveObj.SupplierContract!=''" :href="saveObj.SupplierContract"
@@ -163,7 +162,10 @@
               </template>
             </div>
           </div>
-          <div class="col-6">
+
+        </div>
+        <div class="row">
+          <div class="col-12">
             <span>状态：{{saveObj.SaleStateName}}</span>
           </div>
         </div>
@@ -367,7 +369,8 @@
     computed: mapState({
       //是否有查看合同权限
       isHaveViewContractAction(state) {
-        if (state.user.userInfo.ActionMenuList) {
+        if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
+          0) {
           let action = state.user.userInfo.ActionMenuList.find(x => {
             if (x.FunctionCode == "View_Supplier_Contract") {
               return x;
@@ -379,7 +382,8 @@
       },
       //是否有查看供应商权限
       isHaveViewSupplierAction(state) {
-        if (state.user.userInfo.ActionMenuList) {
+        if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
+          0) {
           let action = state.user.userInfo.ActionMenuList.find(x => {
             if (x.FunctionCode == "View_Supplier") {
               return x;

src/pages/studyAbroad/studyProAudit.vue

@@ -152,7 +152,6 @@
     data() {
       return {
         msg: {
-          Type: 1, //1留学 2就业
           pageIndex: 1,
           pageSize: 10,
           rowsPerPage: 10,
@@ -237,7 +236,7 @@
         ],
         //表格可见列
         visibleColumns: [
-          'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
+          'Name','Type','SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
           "PreferentialListB2BCommission",
           "EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
         ], //可见列