luojun пре 2 година
родитељ
комит
81c2895630
2 измењених фајлова са 143 додато и 410 уклоњено
  1. 141 408
      src/views/system/dept/extend.vue
  2. 2 2
      src/views/system/workTimeSet/workTime.vue

+ 141 - 408
src/views/system/dept/extend.vue

@@ -3,162 +3,85 @@
     <h3 class="title">同步信息</h3>
     <div class="info-box">
       <el-descriptions>
-        <el-descriptions-item
-          v-for="v in dataInfo"
-          :label="v.label"
-          :key="v.key"
-          >{{ v.value }}</el-descriptions-item
-        >
-        <!-- <el-descriptions-item label="机构类型">一级机构</el-descriptions-item> -->
+        <el-descriptions-item v-for="v in dataInfo" :label="v.label" :key="v.key">{{ v.value }}</el-descriptions-item>
+        <el-descriptions-item label="机构组织类型">{{ getLabel(dict.type.sys_org_type, type) }}</el-descriptions-item>
+        <el-descriptions-item label="是否可用">{{ isLock == 1 ? "否" : "是" }}</el-descriptions-item>
       </el-descriptions>
     </div>
 
     <h3 class="title">补充基础信息</h3>
     <div class="info-box">
-      <el-form
-        inline
-        class="demo-form-inline"
-        label-position="left"
-        label-width="120px"
-      >
+      <el-form inline class="demo-form-inline" label-position="left" label-width="120px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="机构类型">
               <el-select v-model="orgType" placeholder="机构类型">
-                <el-option
-                  v-for="(orgTyp, key) in orgTypes"
-                  :key="key"
-                  :label="orgTyp.label"
-                  :value="orgTyp.value"
-                ></el-option>
+                <el-option v-for="dict in dict.type.org_extend_type" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="!orgType" label="天气区域编码">
-              <el-input
-                v-model="weatherAreaCode"
-                placeholder="天气区域编码"
-              ></el-input>
+            <el-form-item v-if="orgType == 1" label="天气区域编码">
+              <el-input v-model="weatherAreaCode" placeholder="天气区域编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="!orgType" label="营业场所面积">
-              <el-input
-                v-model="premisesArea"
-                placeholder="营业场所面积"
-              ></el-input>
+            <el-form-item v-if="orgType == 1" label="营业场所面积">
+              <el-input v-model="premisesArea" placeholder="营业场所面积"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              v-if="orgType"
-              label="建设时间"
-              prop="constructionTime"
-            >
-              <el-date-picker
-                clearable
-                v-model="constructionTime"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择建设时间"
-              >
+            <el-form-item v-if="orgType == 2" label="建设时间" prop="constructionTime">
+              <el-date-picker clearable v-model="constructionTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择建设时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              v-if="orgType"
-              label="最近一次更新"
-              prop="lastUpdateTime"
-            >
-              <el-date-picker
-                clearable
-                v-model="lastUpdateTime"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择更新日期"
-              >
+            <el-form-item v-if="orgType == 2" label="最近一次更新" prop="lastUpdateTime">
+              <el-date-picker clearable v-model="lastUpdateTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择更新日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType" label="平台品牌">
+            <el-form-item v-if="orgType == 2" label="平台品牌">
               <el-select v-model="platformBrand" placeholder="平台品牌">
-                <el-option
-                  v-for="(platformB, key) in platformBrands"
-                  :key="key"
-                  :label="platformB.label"
-                  :value="platformB.value"
-                ></el-option>
+                <el-option v-for="dict in dict.type.org_platform_brand" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType" label="平台供应商品牌">
-              <el-select
-                v-model="platformSupplierBrand"
-                placeholder="平台供应商品牌"
-              >
-                <el-option
-                  v-for="(platformSupplierB, key) in platformSupplierBrands"
-                  :key="key"
-                  :label="platformSupplierB.label"
-                  :value="platformSupplierB.value"
-                ></el-option>
+            <el-form-item v-if="orgType == 2" label="平台供应商品牌">
+              <el-select v-model="platformSupplierBrand" placeholder="平台供应商品牌">
+                <el-option v-for="dict in dict.type.org_platform_supplier_brand" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
-    <div v-if="!orgType" class="info-box">
+    <div v-if="orgType == 1" class="info-box">
       <!--  下拉框选择    -->
       <div>
-        <el-switch
-          v-model="ownership"
-          active-text
-          inactive-text="是否自有产权"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch>
-        <el-switch
-          style="margin-left: 50px"
-          v-model="outsideArea"
-          active-text
-          inactive-text="是否区域外"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch>
+        <el-switch v-model="ownership" active-text inactive-text="是否自有产权" :active-value="1"
+          :inactive-value="0"></el-switch>
+        <el-switch style="margin-left: 50px" v-model="outsideArea" active-text inactive-text="是否区域外" :active-value="1"
+          :inactive-value="0"></el-switch>
       </div>
       <!--  表格   -->
       <div style="margin-top: 30px">
-        <el-button
-          style="margin-bottom: 20px"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleOrgAdd"
-          v-hasPermi="['system:construction:add']"
-          >新增</el-button
-        >
-        <el-table
-          border
-          size="small"
-          v-loading="orgloading"
-          :data="constructionList"
-          @selection-change="handleOrgSelectionChange"
-        >
+        <el-button style="margin-bottom: 20px" type="primary" plain icon="el-icon-plus" size="mini" @click="handleOrgAdd"
+          v-hasPermi="['system:construction:add']">新增</el-button>
+        <el-table border size="small" v-loading="orgloading" :data="constructionList"
+          @selection-change="handleOrgSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="序号" align="center" prop="id" />
           <el-table-column label="标准" align="center" prop="standard" />
-          <el-table-column
-            label="达标日期"
-            align="center"
-            prop="dateOfCompliance"
-            width="180"
-          >
+          <el-table-column label="达标日期" align="center" prop="dateOfCompliance" width="180">
             <template slot-scope="scope">
               <span>{{ formatTime(scope.row.dateOfCompliance) }}</span>
             </template>
@@ -175,55 +98,22 @@
           > -->
           <!-- <el-table-column label="证书" align="center" prop="certificate" />
           <el-table-column label="佐证" align="center" prop="evidence" /> -->
-          <el-table-column
-            v-if="false"
-            label="机构id"
-            align="center"
-            prop="orgId"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
+          <el-table-column v-if="false" label="机构id" align="center" prop="orgId" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleOrgUpdate(scope.row)"
-                v-hasPermi="['system:construction:edit']"
-                >查看证书</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleOrgUpdate(scope.row)"
-                v-hasPermi="['system:construction:edit']"
-                >修改</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleOrgDelete(scope.row)"
-                v-hasPermi="['system:construction:remove']"
-                >删除</el-button
-              >
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleOrgUpdate(scope.row)"
+                v-hasPermi="['system:construction:edit']">查看证书</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleOrgUpdate(scope.row)"
+                v-hasPermi="['system:construction:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleOrgDelete(scope.row)"
+                v-hasPermi="['system:construction:remove']">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
       <!--   上传   -->
       <div style="margin-top: 30px">
-        <el-switch
-          v-model="askari"
-          active-text
-          inactive-text="是否有保安"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch>
+        <el-switch v-model="askari" active-text inactive-text="是否有保安" :active-value="1" :inactive-value="0"></el-switch>
         <div>
 
         </div>
@@ -247,7 +137,7 @@
       </div>
     </div>
 
-    <div v-if="!orgType">
+    <div v-if="orgType == 1">
       <h3 class="title">业务库设置</h3>
       <div class="info-box">
         <el-form inline label-position="left" label-width="100px">
@@ -255,12 +145,8 @@
             <el-col :span="7">
               <el-form-item label="业务库类型">
                 <el-select v-model="businessLibraryType" placeholder="活动区域">
-                  <el-option
-                    v-for="(businessLibraryTy, key) in businessLibraryTypes"
-                    :key="key"
-                    :label="businessLibraryTy.label"
-                    :value="businessLibraryTy.value"
-                  ></el-option>
+                  <el-option v-for="dict in dict.type.business_library_type" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -274,98 +160,43 @@
             </el-col>
             <el-col :span="7">
               <el-form-item label="业务库出入口远程控制" label-width="150">
-                <el-switch
-                  v-model="remoteControl"
-                  active-text
-                  inactive-text
-                  :active-value="1"
-                  :inactive-value="0"
-                ></el-switch>
+                <el-switch v-model="remoteControl" active-text inactive-text :active-value="1"
+                  :inactive-value="0"></el-switch>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <div class="info-box">
-        <el-button
-          style="margin-bottom: 20px"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleBusinessAdd"
-          v-hasPermi="['system:BankPhysicalDefenseConstruction:add']"
-          >新增</el-button
-        >
-        <el-table
-          border
-          size="small"
-          v-loading="businessloading"
-          :data="BusinessPhysicalDefenseConstructionList"
-          @selection-change="handleBusinessSelectionChange"
-        >
+        <el-button style="margin-bottom: 20px" type="primary" plain icon="el-icon-plus" size="mini"
+          @click="handleBusinessAdd" v-hasPermi="['system:BankPhysicalDefenseConstruction:add']">新增</el-button>
+        <el-table border size="small" v-loading="businessloading" :data="BusinessPhysicalDefenseConstructionList"
+          @selection-change="handleBusinessSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="序号" align="center" prop="id" />
           <el-table-column label="标准" align="center" prop="standard" />
-          <el-table-column
-            label="达标日期"
-            align="center"
-            prop="dateOfCompliance"
-            width="180"
-          >
+          <el-table-column label="达标日期" align="center" prop="dateOfCompliance" width="180">
             <template slot-scope="scope">
               <span>{{ formatTime(scope.row.dateOfCompliance) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="证书佐证"
-            align="center"
-            prop="certificateEvidence"
-          >
+          <el-table-column label="证书佐证" align="center" prop="certificateEvidence">
             <template slot-scope="scope">
               <span v-if="scope.row.certificateEvidence > 0">是</span>
               <span v-else>否</span>
-            </template></el-table-column
-          >
+            </template></el-table-column>
           <!-- <el-table-column label="证书" align="center" prop="certificate">
           </el-table-column>
           <el-table-column label="佐证" align="center" prop="evidence" /> -->
-          <el-table-column
-            v-if="false"
-            label="机构id"
-            align="center"
-            prop="orgId"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
+          <el-table-column v-if="false" label="机构id" align="center" prop="orgId" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleBusinessUpdate(scope.row)"
-                v-hasPermi="['system:construction:edit']"
-                >查看证书</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleBusinessUpdate(scope.row)"
-                v-hasPermi="['system:BankPhysicalDefenseConstruction:edit']"
-                >修改</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleBusinessDelete(scope.row)"
-                v-hasPermi="['system:BankPhysicalDefenseConstruction:remove']"
-                >删除</el-button
-              >
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleBusinessUpdate(scope.row)"
+                v-hasPermi="['system:construction:edit']">查看证书</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleBusinessUpdate(scope.row)"
+                v-hasPermi="['system:BankPhysicalDefenseConstruction:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleBusinessDelete(scope.row)"
+                v-hasPermi="['system:BankPhysicalDefenseConstruction:remove']">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -373,115 +204,48 @@
 
       <h3 class="title">在行自助银行设置</h3>
       <div class="info-box">
-        <el-switch
-          v-model="selfServiceBank"
-          active-text
-          inactive-text="是否有在行自助银行"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch>
+        <el-switch v-model="selfServiceBank" active-text inactive-text="是否有在行自助银行" :active-value="1"
+          :inactive-value="0"></el-switch>
         <span style="margin-left: 50px">在行式大堂设备</span>
         <div style="display: inline-block; width: 200px">
-          <el-input-number
-            style="margin-left: 10px"
-            v-model="lobbyEquipment"
-            controls-position="right"
-            @change="handleChange"
-            :min="1"
-            :max="10"
-          ></el-input-number>
+          <el-input-number style="margin-left: 10px" v-model="lobbyEquipment" controls-position="right"
+            @change="handleChange" :min="1" :max="10"></el-input-number>
         </div>
         <span style="margin-left: 50px">在行式穿墙设备</span>
         <div style="display: inline-block; width: 200px">
-          <el-input-number
-            style="margin-left: 10px"
-            v-model="wallPenetratingEquipment"
-            controls-position="right"
-            @change="handleChange"
-            :min="1"
-            :max="10"
-          ></el-input-number>
+          <el-input-number style="margin-left: 10px" v-model="wallPenetratingEquipment" controls-position="right"
+            @change="handleChange" :min="1" :max="10"></el-input-number>
         </div>
       </div>
       <div class="info-box">
-        <el-button
-          style="margin-bottom: 20px"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleBankAdd"
-          v-hasPermi="['system:BankPhysicalDefenseConstruction:add']"
-          >新增</el-button
-        >
-        <el-table
-          border
-          size="small"
-          v-loading="bankloading"
-          :data="BankPhysicalDefenseConstructionList"
-          @selection-change="handleBankSelectionChange"
-        >
+        <el-button style="margin-bottom: 20px" type="primary" plain icon="el-icon-plus" size="mini" @click="handleBankAdd"
+          v-hasPermi="['system:BankPhysicalDefenseConstruction:add']">新增</el-button>
+        <el-table border size="small" v-loading="bankloading" :data="BankPhysicalDefenseConstructionList"
+          @selection-change="handleBankSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="序号" align="center" prop="id" />
           <el-table-column label="标准" align="center" prop="standard" />
-          <el-table-column
-            label="达标日期"
-            align="center"
-            prop="dateOfCompliance"
-            width="180"
-          >
+          <el-table-column label="达标日期" align="center" prop="dateOfCompliance" width="180">
             <template slot-scope="scope">
               <span>{{ formatTime(scope.row.dateOfCompliance) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="证书佐证"
-            align="center"
-            prop="certificateEvidence"
-          >
+          <el-table-column label="证书佐证" align="center" prop="certificateEvidence">
             <template slot-scope="scope">
               <span v-if="scope.row.certificateEvidence > 0">是</span>
               <span v-else>否</span>
-            </template></el-table-column
-          >
+            </template></el-table-column>
           <!-- <el-table-column label="证书" align="center" prop="certificate" />
           <el-table-column label="佐证" align="center" prop="evidence" /> -->
-          <el-table-column
-            v-if="false"
-            label="机构id"
-            align="center"
-            prop="orgId"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
+          <el-table-column v-if="false" label="机构id" align="center" prop="orgId" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleBankUpdate(scope.row)"
-                v-hasPermi="['system:construction:edit']"
-                >查看证书</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleBankUpdate(scope.row)"
-                v-hasPermi="['system:BankPhysicalDefenseConstruction:edit']"
-                >修改</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleBankDelete(scope.row)"
-                v-hasPermi="['system:BankPhysicalDefenseConstruction:remove']"
-                >删除</el-button
-              >
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleBankUpdate(scope.row)"
+                v-hasPermi="['system:construction:edit']">查看证书</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleBankUpdate(scope.row)"
+                v-hasPermi="['system:BankPhysicalDefenseConstruction:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleBankDelete(scope.row)"
+                v-hasPermi="['system:BankPhysicalDefenseConstruction:remove']">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -489,48 +253,26 @@
     </div>
 
     <div style="margin-top: 50px; margin-left: 42%">
-      <el-button type="primary" @click="saveExtend" size="small"
-        >提交</el-button
-      >
-      <el-button type="primary" @click="nosaveExtend" size="small"
-        >取消</el-button
-      >
+      <el-button type="primary" @click="saveExtend" size="small">提交</el-button>
+      <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button>
     </div>
     <!-- 添加或修改业务库物防建设对话框 -->
-    <el-dialog
-      :title="Businesstitle"
-      :visible.sync="Businessopen"
-      width="500px"
-      append-to-body
-    >
+    <el-dialog :title="Businesstitle" :visible.sync="Businessopen" width="500px" append-to-body>
       <el-form ref="Businessform" :model="Businessform" label-width="80px">
         <el-form-item label="标准" prop="standard">
           <el-input v-model="Businessform.standard" placeholder="请输入标准" />
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
-          <el-date-picker
-            clearable
-            v-model="Businessform.dateOfCompliance"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择达标日期"
-          >
+          <el-date-picker clearable v-model="Businessform.dateOfCompliance" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择达标日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="证书佐证" prop="certificateEvidence">
-          <el-switch
-            v-model="Businessform.certificateEvidence"
-            active-text
-            :active-value="1"
-            :inactive-value="0"
-          ></el-switch>
+          <el-switch v-model="Businessform.certificateEvidence" active-text :active-value="1"
+            :inactive-value="0"></el-switch>
         </el-form-item>
         <el-form-item v-if="Businessform.certificateEvidence" label="证书" prop="certificate">
-          <el-input
-            v-if="false"
-            v-model="Businessform.certificate"
-            placeholder="请输入证书"
-          />
+          <el-input v-if="false" v-model="Businessform.certificate" placeholder="请输入证书" />
           <div class="image-container" style="margin-left: 20px">
             <p style="font-size: 12px; color: #999">上传证书</p>
             <image-upload :limit="1" :fileSize="2"></image-upload>
@@ -555,24 +297,14 @@
       </div>
     </el-dialog>
     <!-- 添加或修改银行物防建设对话框 -->
-    <el-dialog
-      :title="Banktitle"
-      :visible.sync="Bankopen"
-      width="500px"
-      append-to-body
-    >
+    <el-dialog :title="Banktitle" :visible.sync="Bankopen" width="500px" append-to-body>
       <el-form ref="Bankform" :model="Bankform" label-width="80px">
         <el-form-item label="标准" prop="standard">
           <el-input v-model="Bankform.standard" placeholder="请输入标准" />
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
-          <el-date-picker
-            clearable
-            v-model="Bankform.dateOfCompliance"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择达标日期"
-          >
+          <el-date-picker clearable v-model="Bankform.dateOfCompliance" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择达标日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="证书佐证" prop="certificateEvidence">
@@ -580,19 +312,10 @@
             v-model="Bankform.certificateEvidence"
             placeholder="请输入证书佐证"
           /> -->
-          <el-switch
-            v-model="Bankform.certificateEvidence"
-            active-text
-            :active-value="1"
-            :inactive-value="0"
-          ></el-switch>
+          <el-switch v-model="Bankform.certificateEvidence" active-text :active-value="1" :inactive-value="0"></el-switch>
         </el-form-item>
         <el-form-item v-if="Bankform.certificateEvidence" label="证书" prop="certificate">
-          <el-input
-            v-if="false"
-            v-model="Bankform.certificate"
-            placeholder="请输入证书"
-          />
+          <el-input v-if="false" v-model="Bankform.certificate" placeholder="请输入证书" />
           <div class="image-container" style="margin-left: 20px">
             <p style="font-size: 12px; color: #999">上传证书</p>
             <image-upload :limit="1" :fileSize="2"></image-upload>
@@ -617,36 +340,21 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      :title="orgtitle"
-      :visible.sync="orgopen"
-      width="500px"
-      append-to-body
-    >
+    <el-dialog :title="orgtitle" :visible.sync="orgopen" width="500px" append-to-body>
       <el-form ref="orgform" :model="orgform" label-width="80px">
         <el-form-item label="标准" prop="standard">
           <el-input v-model="orgform.standard" placeholder="请输入标准" />
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
-          <el-date-picker
-            clearable
-            v-model="orgform.dateOfCompliance"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择达标日期"
-          >
+          <el-date-picker clearable v-model="orgform.dateOfCompliance" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择达标日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="证书佐证" prop="certificateEvidence">
-          <el-switch
-            v-model="orgform.certificateEvidence"
-            active-text
-            :active-value="1"
-            :inactive-value="0"
-          ></el-switch>
+          <el-switch v-model="orgform.certificateEvidence" active-text :active-value="1" :inactive-value="0"></el-switch>
         </el-form-item>
         <el-form-item v-if="orgform.certificateEvidence" label="证书" prop="certificate">
-          <el-input v-if="false"  v-model="orgform.certificate" placeholder="请输入证书" />
+          <el-input v-if="false" v-model="orgform.certificate" placeholder="请输入证书" />
           <div class="image-container" style="margin-left: 20px">
             <p style="font-size: 12px; color: #999">上传证书</p>
             <image-upload :limit="1" :fileSize="2"></image-upload>
@@ -671,6 +379,7 @@
 import uploadpng from "@/assets/images/upload.png";
 import uplpng from "@/assets/images/upl.png";
 import request from "@/utils/request";
+import { statusOptions, getLabel } from "./../../commonOption";
 import {
   listExtend,
   getExtend,
@@ -680,6 +389,7 @@ import {
   getExtendByOrgId,
   uploadFile,
 } from "@/api/system/extend";
+
 import {
   listDept,
   getDept,
@@ -698,6 +408,9 @@ import {
 } from "@/api/system/OrgPhysicalDefenseConstruction";
 
 export default {
+  dicts: [
+    "sys_org_type", "org_platform_brand", "org_platform_supplier_brand", "org_extend_type", "business_library_type"
+  ],
   props: [],
   components: {},
   data() {
@@ -705,14 +418,16 @@ export default {
       //基础信息key
       infoKeys: [
         { label: "机构名称", key: "name" },
-        { label: "机构组织类型", key: "type" },
+        // { label: "机构组织类型", key: "type" },
         { label: "部门机构电话", key: "phone" },
         { label: "部门机构地址", key: "address" },
         { label: "排序号", key: "sort" },
-        { label: "是否可用", key: "isLock" },
+        // { label: "是否可用", key: "isLock" },
         { label: "更新时间", key: "updateTime" },
         { label: "同步时间", key: "createTime" },
       ],
+      type: null,
+      isLock: null,
       dataInfo: [],
       //机构补充信息
       extendId: null,
@@ -816,10 +531,10 @@ export default {
     this.getBankPhysicalDefenseConstructionInfo();
     this.getBusinessPhysicalDefenseConstructionInfo();
   },
-  mounted() {},
+  mounted() { },
   methods: {
-    request() {},
-    handleChange(value) {},
+    request() { },
+    handleChange(value) { },
     getOrgInfo() {
       getDept(this.$route.params.id).then((data) => {
         // console.log(data.data);
@@ -830,6 +545,9 @@ export default {
           v.value = res[v.key];
           return v;
         });
+        this.type = data.data.type;
+        this.isLock = data.data.isLock;
+
         console.log(this.dataInfo, "info");
       });
     },
@@ -849,9 +567,19 @@ export default {
           this.lobbyEquipment = data.data.lobbyEquipment;
           this.wallPenetratingEquipment = data.data.wallPenetratingEquipment;
           this.extendId = data.data.id;
+          this.constructionTime = data.data.constructionTime;
+          this.lastUpdateTime = data.data.lastUpdateTime;
+          this.platformBrand = data.data.platformBrand;
+          this.platformSupplierBrand = data.data.platformSupplierBrand;
+          this.businessLibraryType=data.data.businessLibraryType;
+          this.dutyMode=data.data.dutyMode;
+          // console.log(this.extendId);
         }
       });
     },
+    getLabel(options, value) {
+      return getLabel(options, value);
+    },
     getOrgPhysicalDefenseConstructionInfo() {
       this.orgloading = true;
       let dat = { orgId: this.$route.params.id, type: 1 };
@@ -963,7 +691,7 @@ export default {
           this.getBusinessPhysicalDefenseConstructionInfo();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
 
     // 取消按钮
@@ -1048,7 +776,7 @@ export default {
           this.getBankPhysicalDefenseConstructionInfo();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 表单重置
     orgreset() {
@@ -1131,7 +859,7 @@ export default {
           this.getOrgPhysicalDefenseConstructionInfo();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     saveExtend() {
       let dat = {
@@ -1154,6 +882,7 @@ export default {
         orgId: this.$route.params.id,
         id: this.extendId,
       };
+      console.log(dat);
       if (this.extendId) {
         updateExtend(dat).then((res) => {
           this.$modal.msgSuccess("保存成功");
@@ -1223,15 +952,17 @@ export default {
   padding-left: 8px;
   margin: 0;
 }
+
 .info-box {
   margin: 30px;
 }
-.demo-form-inline {
-}
-.dialog-footer {
-}
-.container {
-}
+
+.demo-form-inline {}
+
+.dialog-footer {}
+
+.container {}
+
 .zoom-image {
   transition: transform 0.3s ease;
 }
@@ -1239,12 +970,14 @@ export default {
 .zoom-image:hover {
   transform: scale(1.02);
 }
+
 .border-color-change {
   border: 1px solid #ccc;
   transition: border-color 0.3s ease;
 }
 
 .border-color-change:hover {
-  border-color: #1ea8e9; /* 您可以将此颜色更改为所需的颜色 */
+  border-color: #1ea8e9;
+  /* 您可以将此颜色更改为所需的颜色 */
 }
 </style>

+ 2 - 2
src/views/system/workTimeSet/workTime.vue

@@ -81,13 +81,13 @@
             >指定日期配置</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <!-- <el-button
               type="warning"
               plain
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              v-hasPermi="['system:time:export']">导出</el-button>
+              v-hasPermi="['system:time:export']">导出</el-button> -->
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>