BUG修改

liuchengxin

2022-06-06 4001279159dd37942b3cf4c83ab537f95832a82d

 src/views/construction/system/index.vue

@@ -16,12 +16,15 @@
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="生产厂商" prop="manufacturerId">
      <el-form-item v-if="showMoreCondition" label="生产厂商" prop="manufacturerId">
        <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -33,7 +36,6 @@
            icon="el-icon-plus"
            size="mini"
            @click="handleAdd"
            v-hasPermi="['oa:system:add']"
        >新增
        </el-button>
      </el-col>
@@ -45,7 +47,6 @@
            size="mini"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['oa:system:edit']"
        >修改
        </el-button>
      </el-col>
@@ -57,7 +58,6 @@
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
            v-hasPermi="['oa:system:remove']"
        >删除
        </el-button>
      </el-col>
@@ -70,19 +70,19 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
      <el-table-column label="软件名称" align="center" prop="name"/>
      <el-table-column label="版本" min-width="180" align="center" prop="edition"/>
      <el-table-column label="功能描述" min-width="180" align="center" prop="functionDescription"/>
      <el-table-column label="授权方式" min-width="180" align="center" prop="authorizationMethod_dictText"/>
      <el-table-column label="授权数量" min-width="180" align="center" prop="authorizedQuantity"/>
      <el-table-column label="载体服务器" align="center" prop="serverId_dictText">
      <el-table-column label="软件名称" align="center" min-width="180" prop="name" show-overflow-tooltip/>
      <el-table-column label="版本" min-width="180" align="center" prop="edition" show-overflow-tooltip/>
      <el-table-column label="授权方式" min-width="180" align="center" prop="authorizationMethod_dictText" show-overflow-tooltip/>
      <el-table-column label="授权数量" min-width="180" align="center" prop="authorizedQuantity" show-overflow-tooltip/>
      <el-table-column label="载体服务器" align="center" width="180" prop="serverId_dictText" show-overflow-tooltip>
        <template slot-scope="scope">
          <el-link type="primary" @click="serverClick(scope.row)">{{scope.row.serverId_dictText}}</el-link>
        </template>
      </el-table-column>
      <el-table-column label="施工批次" min-width="180" align="center" prop="constructionBatchId_dictText"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="备注" align="center" min-width="180" prop="remarks"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
      <el-table-column label="功能描述" min-width="180" align="center" prop="functionDescription" show-overflow-tooltip/>
<!--      <el-table-column label="施工批次" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
<!--      <el-table-column label="备注" align="center" min-width="180" prop="remarks"/>-->
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -97,7 +97,6 @@
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['oa:system:edit']"
          >修改
          </el-button>
          <el-button
@@ -113,7 +112,6 @@
              class="del-btn"
              icon="el-icon-delete"
              @click="handleDelete(scope.row)"
              v-hasPermi="['oa:system:remove']"
          >删除
          </el-button>
        </template>
@@ -144,7 +142,7 @@
          </el-col>
        </el-row>
        <el-form-item label="功能描述" prop="functionDescription">
          <el-input v-model="form.functionDescription" :rows="8" maxlength="512" show-word-limit type="textarea"
          <el-input v-model="form.functionDescription" :rows="3" maxlength="512" show-word-limit type="textarea"
                    placeholder="请输入内容"/>
        </el-form-item>
        <el-row>
@@ -166,9 +164,6 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="载体服务器" prop="serverId">
          <server v-if="open" v-model="form.serverId" :schoolId="schoolId"/>
        </el-form-item>
        <el-row>
          <el-col :span="12">
            <el-form-item label="施工批次" prop="constructionBatchId">
@@ -182,8 +177,23 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="账号/密码" prop="account">
              <el-input v-model="form.account" maxlength="64" show-word-limit placeholder="请输入账号/密码"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="载体服务器" prop="serverId">
              <server v-if="open" v-model="form.serverId" :schoolId="schoolId"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="访问地址" prop="address">
          <el-input v-model="form.address" maxlength="512" show-word-limit placeholder="请输入内容"/>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" :rows="8" maxlength="512" show-word-limit type="textarea" placeholder="请输入内容"/>
          <el-input v-model="form.remarks" :rows="3" maxlength="512" show-word-limit type="textarea" placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -224,6 +234,7 @@
import nvr from "../../components/nvr";
import server from '../../components/server'
import serverForm from '../../components/server/form'
import ShowMore from "@/views/components/showMore";

export default {
  name: "System",
@@ -235,7 +246,8 @@
    manufacturer,
    nvr,
    server,
    serverForm
    serverForm,
    ShowMore
  },
  props: {
    schoolId: {
@@ -306,11 +318,18 @@
        constructionBatchId: [
          {required: true, message: "施工批次不能为空", trigger: "blur"}
        ],
        account: [
          {required: true, message: "账号/密码不能为空", trigger: "blur"}
        ],
        address: [
          {required: true, message: "访问地址不能为空", trigger: "blur"}
        ],
      },
      disabled: false,
      fileOpen: false,
      serverOpen: false,
      serverId: undefined
      serverId: undefined,
      showMoreCondition: false
    };
  },
  created() {