1

ruoyi-ui/src/views/system/user/index.vue

@@ -107,8 +107,8 @@
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
     </el-row>
 
@@ -163,19 +163,21 @@
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
-                  :label="dict.value">{{ dict.label }}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+      dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+            <el-form-item label="甲方代表">
+              <!-- <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
                 <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
                   :disabled="item.status == 1"></el-option>
-              </el-select>
+              </el-select> -->
+              <el-radio v-model="form.isOwner" :label="0">否</el-radio>
+              <el-radio v-model="form.isOwner" :label="1">是</el-radio>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -268,7 +270,9 @@ export default {
       // 角色选项
       roleOptions: [],
       // 表单参数
-      form: {},
+      form: {
+        isOwner: 0
+      },
       defaultProps: {
         children: "children",
         label: "label"
@@ -406,6 +410,7 @@ export default {
         sex: undefined,
         status: "0",
         remark: undefined,
+        isOwner: 0,
         postIds: [],
         roleIds: []
       };
@@ -466,7 +471,8 @@ export default {
         this.$set(this.form, "roleIds", response.roleIds);
         this.open = true;
         this.title = "修改用户";
-        this.form.password = "";
+        this.form.password = ""
+        this.form.isOwner = row.isOwner;
       });
     },
     /** 重置密码按钮操作 */

ruoyi-ui/src/views/tender/tender1/bidding.vue

@@ -108,11 +108,11 @@
           <el-button v-if="checkRole(['operator', 'commander']) && tender && tender.sProjectState == 6" type="primary"
             @click="handleReOpenBid" v-loading.fullscreen.lock="fullscreenLoading">重新开标</el-button>
 
-          <CompDetermineWin v-if="tender && tender.sid" :tender="tender" />
+          <CompDetermineWin v-if="tender && tender.sid && plan.buyingMode != 3" :tender="tender" />
+          <CompDetermineWinXunbi v-if="tender && tender.sid && plan.buyingMode == 3" :tender="tender" />
         </el-tab-pane>
         <el-tab-pane label="中标结果公示" name="annWin" style="font-size: 16px">
-          <CompDetermineWin v-if="plan.buyingMode != 3" ref="refCompWinningBid"></CompDetermineWin>
-          <CompDetermineWinXunbi v-if="plan.buyingMode == 3" ref="refCompWinningBidXunbi"></CompDetermineWinXunbi>
+          <CompWinningBid ref="refCompWinningBid"></CompWinningBid>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -145,6 +145,9 @@ import CompExpert from './components/CompExpert.vue'
 import CompEval from './components/CompEval.vue'
 import CompDetermineWin from './components/CompDetermineWin.vue'
 import CompDetermineWinXunbi from './components/CompDetermineWinXunbi.vue'
+import CompWinningBid from './components/CompWinningBid.vue'
+
+
 import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 
 export default {
@@ -155,6 +158,7 @@ export default {
     ExcelContent,
     CompExpert,
     CompEval,
+    CompWinningBid,
     CompDetermineWin,
     CompDetermineWinXunbi,
     'device-details': DeviceDetails,