Merge branch 'lijinlongNew' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationPc into xuhongjie

.env.development

@@ -5,8 +5,10 @@ VUE_APP_TITLE = 太仓市网络和数据资产采集管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.112:9115'
+# VUE_APP_BASE_API = 'http://192.168.0.103:9115'
 VUE_APP_BASE_API = 'http://39.101.188.84:9115'
+# VUE_APP_BASE_API = 'http://192.168.0.112:9115'
+
 
 # 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true  
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -5,5 +5,5 @@ VUE_APP_TITLE = 太仓市网络和数据资产采集管理系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = 'http://39.101.188.84:9115'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9115'
-# VUE_APP_BASE_API = 'http://20.1.0.164/api'
+VUE_APP_BASE_API = 'http://20.1.0.164/api'

src/App.vue

@@ -20,6 +20,16 @@ export default {
     }
   }
 };
+/* 
+ !!process.env.VUE_APP_BASE_API 开头的为公司环境
+
+ assetsManagement 除了 assetsAuth.vue, 其他文件切换 上传文件 公司环境正式环境
+ myUpload 切换正式环境,公司环境
+ vue.config.js 切换公司环境,正式环境
+ .env.production 切换公司环境,正式环境
+ request.js 切换公司环境,正式环境
+
+*/
 </script>
 <style scoped>
 #app .theme-picker {

src/api/renwuApi/index.js

@@ -196,4 +196,21 @@ export function assetTaskdwHcBl(data) {
     method: "post",
     data,
   })
+}
+
+export function assetTaskzcTj(data) {
+  return request({
+    url: `/unit/assetTask/zcTj`,
+    method: "post",
+    data,
+  })
+}
+
+
+export function assetTaskhistory(params) {
+  return request({
+    url: `/unit/assetTask/history`,
+    method: "get",
+    params,
+  })
 }

src/components/Breadcrumb/index.vue

@@ -64,6 +64,12 @@ export default {
         const route = sidebarRouters.filter(item => item.path == '')
         const twoActiveRoute = route[0].children.filter(item => item.path == "taskInfo")
         this.levelList = [activeRoute[0].children[0],twoActiveRoute[0],matched[0]]
+      }else if(matched[0].path == "/taskAuditInfolishichakan") {
+        // 管理端--任务管理--任务审核--任务管理历史详情
+        const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'task')
+        const route = sidebarRouters.filter(item => item.path == '')
+        const twoActiveRoute = route[0].children.filter(item => item.path == "taskInfo")
+        this.levelList = [activeRoute[0].children[0],twoActiveRoute[0],matched[0]]
       } else if(matched[0].path == "/mytaskAuditInfo") {
         // 单位端--我的任务--资产核查--资产审核详情
         const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'myTask')

src/main.js

@@ -78,6 +78,18 @@ Vue.use(Element, {
 
 Vue.config.productionTip = false
 
+document.addEventListener('input',function (e) {
+  // input框 type='text'
+  //e.target.getAttribute('maxlength') === null，本身没有设置maxlength长度，防止全局设置覆盖所在页面设置的长度
+  if(e.target.type === 'text' && e.target.getAttribute('maxlength') === null) {
+    e.target.setAttribute('maxlength','1000')  // 限制最长输入50个字符
+  }
+  // input框 type='textarea'，且本身没有设置maxlength长度
+  if(e.target.type === 'textarea' && e.target.getAttribute('maxlength') === null) {
+    e.target.setAttribute('maxlength','500') // 限制最长输入500个字符
+  }
+})
+
 new Vue({
   el: '#app',
   router,

src/router/index.js

@@ -94,6 +94,11 @@ export const constantRoutes = [
         component: () => import('@/views/auditPages/taskManagement/audit'),
         name: 'taskAuditInfo',
         meta: { title: '资产审核', icon: 'user', activeMenu: "/task" }
+      },{
+        path: 'taskAuditInfolishichakan',
+        component: () => import('@/views/auditPages/taskManagement/audit'),
+        name: 'taskAuditInfolishichakan',
+        meta: { title: '资产提交记录', icon: 'user', activeMenu: "/task" }
       },{
         path: 'mytaskInfo',
         component: () => import('@/views/unitPages/myTask/info'),

src/utils/request.js

@@ -15,8 +15,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
+  // baseURL: process.env.VUE_APP_BASE_API,
-  // baseURL: process.env.NODE_ENV === "production" ? location.origin + '/api' : process.env.VUE_APP_BASE_API,
+  baseURL: process.env.NODE_ENV === "production" ? location.origin + '/api' : process.env.VUE_APP_BASE_API,
   // 超时
   timeout: 50000
 })
@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
       const s_url = sessionObj.url;                  // 请求地址
       const s_data = sessionObj.data;                // 请求数据
       const s_time = sessionObj.time;                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      const interval = 100;                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请勿重复提交';
         console.warn(`[${s_url}]: ` + message)

src/views/auditPages/assetsManagement/email.vue

@@ -239,14 +239,17 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/tc/assetEmail/importData"
+        // url: process.env.VUE_APP_BASE_API + "/tc/assetEmail/importData"
-        // url: location.origin + "/api/tc/assetEmail/importData"
+        url: location.origin + "/api/tc/assetEmail/importData"
       },
     }
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.getDeptTree();

src/views/auditPages/assetsManagement/index.vue

@@ -1,4 +1,4 @@
-<!-- 资产管理 -- web系统 -->
+<!--assetsManage/assets-->
 <template>
   <el-row :gutter="20" style="height: 100%;background-color: #F2F4F6;display: flex;">
     <!--部门数据-->
@@ -239,7 +239,7 @@ export default {
         dwmc:"",
         xtzt:"",
         current:1,
-        size:10,
+        size:20,
       },
       total:0,
       tableData:[],
@@ -258,15 +258,19 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import"
+        // url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import"
-        // url: location.origin + "/api/tc/assetCurrent/importData"
+        url: location.origin + "/api/tc/assetCurrent/importData"
       },
     }
   },
   mounted(){
-    // console.log(this.$route.params,"params");
+    if( Object.keys(this.$route.params).length != 0) {
-    if(this.$route.params) {
+    console.log(this.$route.params,"params");
+      
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.getDeptTree();
@@ -296,6 +300,8 @@ export default {
     // 获取列表
     getList(){
       this.loading = true;
+      console.log(this.formInline);
+      
       assetUnit('get',this.formInline).then(res=>{
         this.loading = false;
         this.total = res.data.total;
@@ -312,6 +318,7 @@ export default {
     // 查询
     handleQuery(){
       this.formInline.current = 1;
+      this.formInline.size = 20
       if(this.formInline.time) {
         this.formInline.startTime = this.formInline.time[0]
         this.formInline.endTime = this.formInline.time[1]

src/views/auditPages/assetsManagement/mobileApplication.vue

@@ -265,14 +265,17 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/tc/assetApp/importData"
+        // url: process.env.VUE_APP_BASE_API + "/tc/assetApp/importData"
-        // url: location.origin + "/api/tc/assetApp/importData"
+        url: location.origin + "/api/tc/assetApp/importData"
       },
     }
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.getDeptTree();

src/views/auditPages/assetsManagement/officialAccount.vue

@@ -122,6 +122,11 @@
               <!-- <el-table-column label="单位名称" key="dwmc" prop="dwmc" align="center">
               </el-table-column> -->
               <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
+              <el-table-column label="平台类型" key="ptlx" prop="ptlx" align="center">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_ptlx_type" :value="scope.row.ptlx"/>
+            </template>
+          </el-table-column>
               <el-table-column label="公众号状态" key="status" prop="status" class-name="table-status" align="center">
                 <template slot-scope="scope">
                   <span  v-if="scope.row.gzhzt == 1" style="color: #16B771;">
@@ -215,7 +220,7 @@ import myPagination from "@/views/components/Pagination/index.vue"
 import { getToken } from "@/utils/auth";
 import { assetOfficialAccountList, deleteAssetOfficialAccount, schema } from "@/api/auditPagesApi/index";
 export default {
-  dicts: ['zc_xtzt','zc_xtlx'],
+  dicts: ['zc_xtzt','zc_xtlx','sys_ptlx_type'],
   components:{myPagination},
   data() {
     return {
@@ -251,14 +256,17 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/tc/assetOfficialAccount/importData"
+        // url: process.env.VUE_APP_BASE_API + "/tc/assetOfficialAccount/importData"
-        // url: location.origin + "/api/tc/assetOfficialAccount/importData"
+        url: location.origin + "/api/tc/assetOfficialAccount/importData"
       },
     }
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.getDeptTree();

src/views/auditPages/assetsManagement/program.vue

@@ -250,14 +250,17 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/tc/miniPrograms/importData"
+        // url: process.env.VUE_APP_BASE_API + "/tc/miniPrograms/importData"
-        // url: location.origin + "/api/tc/miniPrograms/importData"
+        url: location.origin + "/api/tc/miniPrograms/importData"
       },
     }
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.getDeptTree();

src/views/auditPages/taskManagement/index.vue

@@ -147,7 +147,7 @@
             </el-form-item>
             <el-form-item label="核查单位" prop="dwmc" class="select-box">
               <el-col>
-                <el-select v-model="ruleForm.dwmc" placeholder="请选择核查单位" multiple collapse-tags>
+                <el-select v-model="ruleForm.dwmc" placeholder="请选择核查单位" multiple collapse-tags @remove-tag="isclear">
                 </el-select>
               </el-col>
               <el-col class="btn-box">
@@ -288,6 +288,11 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods: {
+    isclear(value,index){
+   
+      this.tabclicklist = this.tabclicklist.filter(user => user.nickName != value)
+      
+    },
     disabledDate(time) {
       // 禁用当前时间之前的时间选项
       console.log(time);
@@ -409,9 +414,9 @@ export default {
         setTimeout(() => {
           this.$refs.danweiList.getType(this.ruleForm.type)
 
-          this.$refs.danweiList.getList()
+          // this.$refs.danweiList.getList()
 
-        }, 100);
+        }, 10);
         if (this.tabclicklist) {
           setTimeout(() => {
             this.$refs.danweiList.dakai(this.tabclicklist)

src/views/auditPages/taskManagement/info.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="L-task-info">
+
+
     <div class="info-left" id="L-size-main">
       <div class="content-info" id="L-header">
         <div class="info-title">任务详情</div>
@@ -52,6 +54,11 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
+            <el-col :span="7">
+              <el-form-item label="系统名称:">
+                <el-input v-model="formInline.xtmc" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="7">
               <el-form-item label="审核状态:">
                 <el-select v-model="formInline.status" placeholder="请选择">
@@ -63,8 +70,8 @@
                   </el-option>
                   <el-option label="审核不通过" value="4">
                   </el-option>
-                  <!-- <el-option label="已关停" value="5">
+                  <el-option label="已关停" value="5">
-                  </el-option> -->
+                  </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -94,7 +101,6 @@
             <el-col :span="7">
               <el-form-item label="完成状态：">
                 <el-select v-model="formInlineTwo.taskStatus" placeholder="请选择">
-
                   <el-option label="进行中" value="1">
                   </el-option>
                   <el-option label="正常完成" value="2">
@@ -121,7 +127,7 @@
           <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName">
             <el-table-column type="index" width="50" label="序号" align="center" />
             <!-- <el-table-column label="资产编号" key="id" width="200px" prop="id" align="center" /> -->
-            <el-table-column :label="xtmcName" key="xtmc" prop="xtmc" align="center" />
+            <el-table-column :label="xtmcName" prop="xtmc" align="center" />
             <!-- <el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
               <template slot-scope="scope" >
                 <div v-if='scope.row.xtlx'>
@@ -130,8 +136,9 @@
                 </div>
               </template>
 </el-table-column> -->
-            <el-table-column label="核查单位" key="zcdwmc" prop="zcdwmc" align="center" />
+            <el-table-column label="核查单位" prop="zcdwmc" align="center" />
-            <el-table-column label="审核状态" key="status" width="200px" prop="status" class-name="table-status"
+            <el-table-column label="单位核查时间" prop="updateTime" align="center" />
+            <el-table-column label="审核状态" key="status" width="120px" prop="status" class-name="table-status"
               align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.status == 0" style="color: #e6a230;">
@@ -166,11 +173,17 @@
                     <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
                     <span class="look-info" style="color: #1485EF;">审核</span>
                   </div>
+                  <!-- scope.row.status == 4  -->
                   <div style="display: flex;align-items: center;cursor: pointer;margin-left: 5px;"
-                    @click="goInfo(3, scope.row)" v-show='scope.row.status == 4'>
+                    @click="goInfo(3, scope.row)" v-show='scope.row.btgyy'>
                     <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
                     <span class="look-info" style="color: #1485EF;">查看原因</span>
                   </div>
+                  <div style="display: flex;align-items: center;cursor: pointer;margin-left: 5px;"
+                    @click="looklishi(scope.row)" v-if="scope.row.status != 0 && scope.row.status != 5">
+                    <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                    <span class="look-info" style="color: #1485EF;">提交记录</span>
+                  </div>
                 </div>
               </template>
             </el-table-column>
@@ -207,9 +220,9 @@
                   </span>
                 </template>
               </el-table-column>
-              <el-table-column label="核查资产数量" key="total" width="120px" prop="total" align="center" />
+              <el-table-column label="核查资产数量" width="120px" prop="total" align="center" />
-              <el-table-column label="待核查数量" key="total" width="120px" prop="notChecked" align="center" />
+              <el-table-column label="待核查数量" width="120px" prop="notChecked" align="center" />
-              <el-table-column label="待审批数量" key="total" width="120px" prop="dsp" align="center" />
+              <el-table-column label="待审批数量" width="120px" prop="dsp" align="center" />
               <el-table-column label="完成数量" key="checked" prop="checked" align="center">
                 <!-- <template slot-scope="scope">
                     <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
@@ -259,11 +272,44 @@
         </el-descriptions-item>
       </el-descriptions>
     </my-dialog>
+
+
+    <my-dialog title="资产提交记录" ref="zichantijiaojil" @close="importClose" class="taskDialogBox" width="40%">
+      <el-table v-loading="loading" :data="tableDatajilu" :height="tabHeader" :row-class-name="tableRowClassName">
+        <el-table-column :label="xtmcName" prop="xtmc" align="center" />
+        <el-table-column label="提交时间" prop="updateTime" align="center" />
+        <el-table-column label="提交状态" width="120px" prop="status" class-name="table-status" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status == 1 || scope.row.status == 3" style="color: #E6A23C;">
+              核查提交
+            </span>
+            <span v-if="scope.row.status == 4" style="color: #F56C6C;">
+              审核驳回后提交
+            </span>
+            <span v-if="scope.row.status == 5" style="color: #F56C6C;">
+              资产关停
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
+          <template slot-scope="scope">
+            <div style="display: flex;align-items: center;justify-content: center;">
+              <div style="display: flex;align-items: center;cursor: pointer;" @click="tjiaojilchakan(scope.row)">
+                <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                <span class="look-info" style="color: #1485EF;">查看</span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </my-dialog>
+
+
   </div>
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
-import { getassetTaskid, geassetTaskcHc, assetTaskdwHc, assetLcpage, assetTaskdwHcBl } from "@/api/renwuApi/index.js"
+import { getassetTaskid, geassetTaskcHc, assetTaskdwHc, assetLcpage, assetTaskdwHcBl, assetTaskzcTj } from "@/api/renwuApi/index.js"
 import myDialog from "@/views/components/myDialog/index.vue"
 import * as echarts from 'echarts';
 
@@ -290,6 +336,7 @@ export default {
       tableDataTwo: [
 
       ],
+      tableDatajilu: [],
       loading: false,
       tabHeader: undefined,
       timeLineData: [],
@@ -333,11 +380,14 @@ export default {
         { value: 0, name: '进行中', taskStatus: "1" },
         { value: 0, name: '正常完成', taskStatus: "2" },
         { value: 0, name: '超期完成', taskStatus: "3" },
-      ]
+      ],
+      lookassetId: "",
+      pageTypetow: "",
+      taskisid: ""
     }
   },
   mounted() {
-  
+
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
     // 获取详情
@@ -351,12 +401,13 @@ export default {
       if (JSON.parse(localStorage.getItem('ismypaginationTow')).isfanhuiTow) {
         this.formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
         this.titleInfo()
-
       } else {
-
         localStorage.removeItem("ismypaginationTow")
       }
     }
+    this.pageTypetow = this.$route.query.pageType
+
+
 
   },
   destroyed() {
@@ -364,6 +415,42 @@ export default {
   },
 
   methods: {
+    tjiaojilchakan(row) {
+      console.log();
+
+      this.$router.push({
+        name: 'taskAuditInfolishichakan', query: {
+          pageType: "look",
+          taskId: this.taskisid,
+          assetId: row.id,
+          lookassetId: this.lookassetId,
+          type: this.activeName,
+          pageTypetow: this.pageTypetow,
+          istijiaoshow: true
+        }
+      })
+    },
+    looklishi(row) {
+      console.log(row);
+      this.lookassetId = row.id
+      let obj = {
+        "assetId": row.id - 0,
+        "taskId": row.taskId - 0,
+        "type": this.activeName - 0
+      }
+      assetTaskzcTj(obj).then(res => {
+        this.tableDatajilu = res.data
+        if(this.tableDatajilu.length !=0){
+          this.tableDatajilu.forEach(res=>{
+            res.status = 4
+          })
+          this.tableDatajilu[0].status = 1
+
+        }
+        this.$refs.zichantijiaojil.open()
+
+      })
+    },
     sendBack() {
       if (localStorage.getItem('ismypagination')) {
         let formInline = JSON.parse(localStorage.getItem('ismypagination'))
@@ -374,7 +461,6 @@ export default {
       this.$router.go(-1);
     },
     shouqiisis() {
-      console.log(123);
       this.isshow = !this.isshow
       // this.myEchartsis()
     },
@@ -387,10 +473,10 @@ export default {
     },
     //切换资产核查tab
     handleClick(tab, event) {
-    
+
       this.activeName = tab.name
-      this.xtmcName = tab.$attrs.xtmcName,
+      this.xtmcName = tab.$attrs.xtmcName
-        localStorage.setItem("activeName", this.activeName)
+      localStorage.setItem("activeName", this.activeName)
 
       this.handleQuery()
     },
@@ -488,7 +574,6 @@ export default {
       }
     },
     titleInfoObjtype(type = "0,1") {
-      console.log(type);
       let list = type.split(",")
       this.listTow = []
       this.chanckListTow = []
@@ -512,14 +597,29 @@ export default {
         this.xtmcName = listname[0].xtmcName
 
       }
+      if (this.$route.query.istijiaoshow) {
+        this.looklishi({
+          taskId: this.$route.query.id,
+          id: this.$route.query.lookassetId
+        })
+
+        const query = { ...this.$route.query };
+        // 检查要删除的查询参数是否存在，如果存在则删除
+        if (query.istijiaoshow) {
+          delete query.istijiaoshow;
+          // 使用 $router.replace() 方法更新路由，但不改变浏览历史
+          this.$router.replace({ query });
+        }
+      }
       this.handleQuery();
 
     },
     titleInfo() {
-      // console.log(this.$route.query);
       getassetTaskid(this.$route.query.id || this.$route.meta.id).then(res => {
         if (res.code == 200) {
           this.titleInfoObj = res.data
+          this.taskisid = res.data.id
+
           this.titleInfoObjtype(this.titleInfoObj.type)
         }
       })
@@ -528,13 +628,15 @@ export default {
     // 重置
     resetQuery() {
       this.activeName = this.chanckListTow[0].lable
-      this.xtmcName = "系统名称",
 
-        this.pagination = {
+      this.xtmcName = "系统名称"
-          current: 1,
+
-          size: 10,
+      this.pagination = {
-          type: this.activeName,
+        current: 1,
-        }
+        size: 10,
+        type: this.activeName,
+      }
+
       if (this.index == 1) {
         this.formInline = {
           type: this.activeName,
@@ -585,7 +687,6 @@ export default {
       this.pagination.size = 10;
       this.total = 0
       this.index = id
-      console.log(id);
 
       this.resetQuery()
       if (id == 2) {
@@ -599,6 +700,8 @@ export default {
     getList() {
       this.loading = true
       this.pagination.taskId = this.$route.query.id || this.$route.meta.id
+      this.pagination.type = this.activeName
+
       geassetTaskcHc(this.pagination).then(res => {
         this.tableData = res.data.records
         this.total = res.data.total
@@ -635,7 +738,6 @@ export default {
     },
     myEchartsis() {
       // var chartDom = document.querySelector('.myEcharts');
-      console.log(this.$refs.myEcharts);
 
       this.myChart = echarts.init(this.$refs.myEcharts);
       this.option = {
@@ -671,7 +773,6 @@ export default {
       this.option && this.myChart.setOption(this.option);
       this.myChart.on('click', (params) => {
         // params 包含了事件的数据和图表的信息
-        console.log(params.data.taskStatus);
         this.formInlineTwo.taskStatus = params.data.taskStatus
         this.handleQuery()
         // 可以在这里添加你的逻辑，比如弹窗显示详细信息等

src/views/auditPages/unitManagement/index.vue

@@ -1,4 +1,4 @@
-<!-- 新增单位 -->
+<!-- unitAuth -->
 <template>
   <div class="L-assets-info">
     <div class="assets-info-top">
@@ -473,7 +473,7 @@
           <div v-for="(domain, index) in ruleForm.jcxxList" :key="domain.key" :prop="'jcxxList.' + index + '.value'">
             <el-row style="display: flex;">
               <el-col :span="8">
-                <el-form-item class="daoqitixingren" required :label="'时间' + (index == 0 ? '' : index)">
+                <el-form-item class="daoqitixingren"  :label="'时间' + (index == 0 ? '' : index)">
                   <el-date-picker
                     v-model="domain.sj"
                     type="date"
@@ -485,12 +485,12 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item class="daoqitixingren" :label="'系统域名' + (index == 0 ? '' : index)">
-                  <el-input v-model="domain.tyshxydm" placeholder="请输入系统域名"></el-input>
+                  <el-input v-model="domain.xtym" placeholder="请输入系统域名"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="7">
                 <el-form-item class="daoqitixingren" :label="'系统名称' + (index == 0 ? '' : index)">
-                  <el-input v-model="domain.lxdh" placeholder="请输入系统名称"></el-input>
+                  <el-input v-model="domain.xthc" placeholder="请输入系统名称"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
@@ -520,7 +520,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="'检查结果' + (index == 0 ? '' : index)">
-                  <el-input type="textarea" resize="none" placeholder="请输入检查结果" :rows="5" v-model="domain.xgyw_ywms"></el-input>
+                  <el-input type="textarea" resize="none" placeholder="请输入检查结果" :rows="5" v-model="domain.jcjg"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>

src/views/components/assetsType/index_v1.vue

@@ -274,6 +274,7 @@
 </template>
 <script>
 import { assetMiniPrograms, miniProgramsInfo, unitAllList } from "@/api/auditPagesApi/index";
+import equalToPassword from '@/views/components/assetsType/mainx.js'
 export default {
   dicts:['app_xzqh','app_sshy','app_zdhy','gzh_state','gzh_rzzt','gzh_rzlx','email_state'],
   data() {
@@ -283,7 +284,9 @@ export default {
       },
       rules:{
         ssdw:[
-          { required: true, message: "所属单位不能为空", trigger: "blur" }
+          { required: true, message: "所属单位不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "change" }
+
         ],
         xcxmc:[
           { required: true, message: "小程序名称不能为空", trigger: "blur" }

src/views/components/assetsType/index_v2.vue

@@ -6,29 +6,22 @@
         <span class="top-title-box">基本信息</span>
       </el-row>
       <div class="assets-info-box">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="170px" class="demo-ruleForm" label-position="right" :disabled="disabled">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="170px" class="demo-ruleForm"
+          label-position="right" :disabled="disabled">
           <el-row>
             <el-col :span="12">
               <el-form-item label="所属单位" prop="ssdw">
                 <!-- <el-input v-model="ruleForm.ssdw" placeholder="请输入单位名称"></el-input> -->
                 <!-- :disabled="!disabledTwo" -->
-                <el-autocomplete
+                <el-autocomplete v-model="ruleForm.ssdw" :fetch-suggestions="querySearchAsync"
-                  v-model="ruleForm.ssdw"
+                  placeholder="请输入所属单位"></el-autocomplete>
-                  :fetch-suggestions="querySearchAsync"
-                  placeholder="请输入所属单位"
-                  
-                ></el-autocomplete>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="平台类型" prop="ptlx" required>
-                <el-select v-model="ruleForm.ptlx" @change="ptlxChange" placeholder="请选择平台类型" >
+                <el-select v-model="ruleForm.ptlx" @change="ptlxChange" placeholder="请选择平台类型">
-                  <el-option 
+                  <el-option v-for="dict in dict.type.sys_ptlx_type" :key="dict.value" :label="dict.label"
-                    v-for="dict in dict.type.sys_ptlx_type" 
+                    :value="dict.value" />
-                    :key="dict.value" 
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -41,11 +34,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="公众号名称" prop="gzhmc"
+                <el-form-item label="公众号名称" prop="gzhmc" :rules="[
-                  :rules="[
+                  { required: true, message: '公众号名称不能为空', trigger: 'blur' }
-                    { required: true, message: '公众号名称不能为空', trigger: 'blur' }
+                ]">
-                  ]"
-                >
                   <el-input v-model="ruleForm.gzhmc" placeholder="请输入公众号名称"></el-input>
                 </el-form-item>
               </el-col>
@@ -53,15 +44,13 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item class="daoqitixingren" label="统一社会信用代码" required>
-                  <el-form-item prop="tyshxydm"
+                  <el-form-item prop="tyshxydm" :rules="[
-                    :rules="[
+                    {
-                      {
+                      pattern: /^[a-zA-Z0-9]{18}$/,
-                        pattern: /^[a-zA-Z0-9]{18}$/,
+                      message: '请输入正确格式的18位统一社会信用代码',
-                        message: '请输入正确格式的18位统一社会信用代码',
+                      trigger: 'blur'
-                        trigger: 'blur'
+                    }
-                      }
+                  ]">
-                    ]"
-                  >
                     <el-input v-model="ruleForm.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-form-item>
@@ -69,12 +58,8 @@
               <el-col :span="12">
                 <el-form-item label="公众号状态" required>
                   <el-select v-model="ruleForm.gzhzt" placeholder="请选择公众号状态">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_state" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_state"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -88,12 +73,8 @@
               <el-col :span="12">
                 <el-form-item label="公众号类型" required>
                   <el-select v-model="ruleForm.gzhlx" placeholder="请选择公众号类型">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_lx" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_lx"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -102,22 +83,14 @@
               <el-col :span="12">
                 <el-form-item label="认证状态" required>
                   <el-select v-model="ruleForm.rzState" placeholder="请选择认证状态">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_rzzt" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_rzzt"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="认证时间" required>
-                  <el-date-picker
+                  <el-date-picker v-model="ruleForm.rzsj" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                    v-model="ruleForm.rzsj"
-                    type="date"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
                     placeholder="选择日期">
                   </el-date-picker>
                 </el-form-item>
@@ -127,24 +100,16 @@
               <el-col :span="12">
                 <el-form-item label="认证类型" required>
                   <el-select v-model="ruleForm.rzlx" placeholder="请选择认证类型">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_rzlx" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_rzlx"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="所属行业" required>
                   <el-select v-model="ruleForm.sshy" placeholder="请选择所属行业">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_sshy" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_sshy"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -153,24 +118,16 @@
               <el-col :span="12">
                 <el-form-item label="重点行业" required>
                   <el-select v-model="ruleForm.zdhy" placeholder="请选择重点行业">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_zdhy" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_zdhy"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="行政区划" required>
                   <el-select v-model="ruleForm.xzqh" placeholder="请选择行政区划">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_xzqh" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_xzqh"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -183,15 +140,13 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="系统责任人电话" required>
-                  <el-form-item prop="xtzrrdh"
+                  <el-form-item prop="xtzrrdh" :rules="[
-                    :rules="[
+                    {
-                      {
+                      pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                      message: '请输入正确的手机号码',
-                        message: '请输入正确的手机号码',
+                      trigger: 'blur'
-                        trigger: 'blur'
+                    }
-                      }
+                  ]">
-                    ]"
-                  >
                     <el-input v-model="ruleForm.xtzrrdh" style="width: 100%;" placeholder="请输入系统责任人电话"></el-input>
                   </el-form-item>
                 </el-form-item>
@@ -200,15 +155,13 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="系统责任人邮箱" required>
-                  <el-form-item prop="xtzrryx"
+                  <el-form-item prop="xtzrryx" :rules="[
-                    :rules="[
+                    {
-                      {
+                      type: 'email',
-                        type: 'email',
+                      message: '请输入正确的邮箱地址',
-                        message: '请输入正确的邮箱地址',
+                      trigger: ['blur', 'change']
-                        trigger: ['blur', 'change']
+                    }
-                      }
+                  ]">
-                    ]"
-                  >
                     <el-input v-model="ruleForm.xtzrryx" style="width: 100%;" placeholder="请输入系统责任人邮箱"></el-input>
                   </el-form-item>
                 </el-form-item>
@@ -220,23 +173,6 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="菜单信息（菜单名称）" required>
-                  <el-input v-model="ruleForm.cdmc" style="width: 100%;" placeholder="请输入菜单信息（菜单名称）"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="菜单信息（菜单链接）" required>
-                  <el-input v-model="ruleForm.cdlj" style="width: 100%;" placeholder="请输入菜单信息（菜单链接）"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="菜单信息（菜单类型）" required>
-                  <el-input v-model="ruleForm.cdlx" style="width: 100%;" placeholder="请输入菜单信息（菜单类型）"></el-input>
-                </el-form-item>
-              </el-col>
               <el-col :span="12">
                 <el-form-item label="认证主体" required>
                   <el-input v-model="ruleForm.rzzt" style="width: 100%;" placeholder="请输入认证主体"></el-input>
@@ -246,34 +182,68 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="系统简介" required>
-                  <el-input type="textarea" resize="none" placeholder="请输入系统简介" :rows="5" v-model="ruleForm.xtjj"></el-input>
+                  <el-input type="textarea" resize="none" placeholder="请输入系统简介" :rows="5"
+                    v-model="ruleForm.xtjj"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-          </div> 
+            <!-- 菜单信息 -->
+            <div>
+              <el-row>
+                <span class="top-title-box">菜单信息</span>
+              </el-row>
+              <el-row v-for="(domain, index) in ruleForm.cdList">
+                <el-col :span="12">
+                  <el-form-item :label="'菜单名称' + (index == 0 ? '' : index)" required>
+                    <el-input v-model="domain.cdmc" style="width: 100%;" placeholder="请输入菜单名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item :label="'菜单链接' + (index == 0 ? '' : index)" required>
+                    <el-input v-model="domain.cdlj" style="width: 100%;" placeholder="请输入菜单链接"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item :label="'菜单类型' + (index == 0 ? '' : index)" required>
+                    <el-select v-model="domain.cdlx" placeholder="请选择菜单类型">
+                      <el-option v-for="dict in dict.type.gzh_cdlx" :key="dict.value" :label="dict.label"
+                        :value="dict.value" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="1" style="text-align: center; " v-if="!disabled" v-show="index != 0">
+                  <i @click="removeDomain(domain, 'cdList')" class="el-icon-remove-outline"
+                    style="font-size: 16px;cursor: pointer;margin-top: 8px;"></i>
+                </el-col>
+              </el-row>
+              <el-row v-if="pageType !== 'look'">
+                <el-col :span="24">
+                  <el-form-item>
+                    <el-button @click="addOtherConcat('cdList')">添加菜单</el-button>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
           <div v-else>
             <el-row>
               <el-col :span="12">
                 <el-form-item class="daoqitixingren" label="统一社会信用代码" required>
-                  <el-form-item prop="tyshxydm"
+                  <el-form-item prop="tyshxydm" :rules="[
-                    :rules="[
+                    {
-                      {
+                      pattern: /^[a-zA-Z0-9]{18}$/,
-                        pattern: /^[a-zA-Z0-9]{18}$/,
+                      message: '请输入正确格式的18位统一社会信用代码',
-                        message: '请输入正确格式的18位统一社会信用代码',
+                      trigger: 'blur'
-                        trigger: 'blur'
+                    }
-                      }
+                  ]">
-                    ]"
-                  >
                     <el-input v-model="ruleForm.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="账号名称" prop="gzhmc"
+                <el-form-item label="账号名称" prop="gzhmc" :rules="[
-                  :rules="[
+                  { required: true, message: '账号名称不能为空', trigger: 'blur' }
-                    { required: true, message: '账号名称不能为空', trigger: 'blur' }
+                ]">
-                  ]"
-                >
                   <el-input v-model="ruleForm.gzhmc" placeholder="请输入账号名称"></el-input>
                 </el-form-item>
               </el-col>
@@ -287,12 +257,8 @@
               <el-col :span="12">
                 <el-form-item label="账号状态" required>
                   <el-select v-model="ruleForm.gzhzt" placeholder="请选择账号状态">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_state" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_state"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -313,24 +279,16 @@
               <el-col :span="12">
                 <el-form-item label="重点行业" required>
                   <el-select v-model="ruleForm.zdhy" placeholder="请选择重点行业">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_zdhy" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_zdhy"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="所属行业" required>
                   <el-select v-model="ruleForm.sshy" placeholder="请选择所属行业">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_sshy" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_sshy"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -343,15 +301,13 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="系统责任人电话" required>
-                  <el-form-item prop="xtzrrdh"
+                  <el-form-item prop="xtzrrdh" :rules="[
-                    :rules="[
+                    {
-                      {
+                      pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                      message: '请输入正确的手机号码',
-                        message: '请输入正确的手机号码',
+                      trigger: 'blur'
-                        trigger: 'blur'
+                    }
-                      }
+                  ]">
-                    ]"
-                  >
                     <el-input v-model="ruleForm.xtzrrdh" style="width: 100%;" placeholder="请输入系统责任人电话"></el-input>
                   </el-form-item>
                 </el-form-item>
@@ -360,15 +316,13 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="系统责任人邮箱" required>
-                  <el-form-item prop="xtzrryx"
+                  <el-form-item prop="xtzrryx" :rules="[
-                    :rules="[
+                    {
-                      {
+                      type: 'email',
-                        type: 'email',
+                      message: '请输入正确的邮箱地址',
-                        message: '请输入正确的邮箱地址',
+                      trigger: ['blur', 'change']
-                        trigger: ['blur', 'change']
+                    }
-                      }
+                  ]">
-                    ]"
-                  >
                     <el-input v-model="ruleForm.xtzrryx" style="width: 100%;" placeholder="请输入系统责任人邮箱"></el-input>
                   </el-form-item>
                 </el-form-item>
@@ -382,7 +336,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="系统简介" required>
-                  <el-input type="textarea" resize="none" placeholder="请输入系统简介" :rows="5" v-model="ruleForm.xtjj"></el-input>
+                  <el-input type="textarea" resize="none" placeholder="请输入系统简介" :rows="5"
+                    v-model="ruleForm.xtjj"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -401,32 +356,43 @@
 </template>
 <script>
 import { assetOfficialAccount, assetOfficialAccountInfo, unitAllList } from "@/api/auditPagesApi/index";
+import equalToPassword from '@/views/components/assetsType/mainx.js'
+
 export default {
-  dicts:['app_xzqh','app_sshy','app_zdhy','gzh_state','gzh_lx','gzh_rzzt','gzh_rzlx','gzh_cdlx', 'sys_ptlx_type'],
+  dicts: ['app_xzqh', 'app_sshy', 'app_zdhy', 'gzh_state', 'gzh_lx', 'gzh_rzzt', 'gzh_rzlx', 'gzh_cdlx', 'sys_ptlx_type'],
   data() {
     return {
-      ruleForm:{
+      ruleForm: {
         ptlx: "1",
+        cdList: [
+          {
+            cdmc: "",
+            cdlj: "",
+            cdlx: "",
+          }
+        ]
       },
-      rules:{
+      rules: {
-        ssdw:[
+        ssdw: [
-          { required: true, message: "所属单位不能为空", trigger: "blur" }
+          { required: true, message: "所属单位不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "change" }
+
         ],
         // gzhmc:[
         //   { required: true, message: "公众号名称不能为空", trigger: "blur" }
         // ],
       },
-      loading:false,
+      loading: false,
-      disabled:false,
+      disabled: false,
       // disabledTwo:true,
     }
   },
-  props:['pageType', 'id', 'queryData'],
+  props: ['pageType', 'id', 'queryData'],
-  mounted(){
+  mounted() {
-    if(this.pageType == 'look') {
+    if (this.pageType == 'look') {
       this.getInfo(this.id)
       this.disabled = true;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         const inputElements = document.querySelectorAll('.el-input__inner');
         const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
         inputElements.forEach((input) => {
@@ -436,31 +402,46 @@ export default {
           input.placeholder = '';
         });
       })
-    } else if(this.pageType == 'change') {
+    } else if (this.pageType == 'change') {
       this.getInfo(this.id)
       this.disabled = false;
       // this.disabledTwo = false;
 
     }
   },
-  methods:{
+  methods: {
-    getInfo(id){
+    removeDomain(item, type) {
-      assetOfficialAccountInfo(id).then(res=>{
+      var index = this.ruleForm[type].indexOf(item)
+      if (index !== -1) {
+        this.ruleForm[type].splice(index, 1)
+      }
+    },
+    // 新增其他联系人
+    addOtherConcat(type) {
+      this.ruleForm[type].push({
+        cdmc: "",
+        cdlj: "",
+        cdlx: "",
+        // key: Date.now()
+      });
+    },
+    getInfo(id) {
+      assetOfficialAccountInfo(id).then(res => {
         this.ruleForm = res.data;
       })
     },
     // 平台类型切换
     ptlxChange(item) {
-      Object.keys(this.ruleForm).forEach((key)=>{
+      Object.keys(this.ruleForm).forEach((key) => {
-        if(key !== 'ssdw' && key !== 'ptlx') {
+        if (key !== 'ssdw' && key !== 'ptlx') {
           this.ruleForm[key] = '';
         }
       })
     },
     // 单位名称模糊查询
-    querySearchAsync(queryString, cb){
+    querySearchAsync(queryString, cb) {
       let results = [];
-      unitAllList({nickName: queryString}).then(res => {
+      unitAllList({ nickName: queryString }).then(res => {
         res.data.forEach(item => {
           results.push({
             value: item.nickName,
@@ -471,20 +452,22 @@ export default {
       cb(results);
     },
     // 新增资产确认按钮
-    newAssets(){
+    newAssets() {
+      console.log(this.ruleForm);
+
       this.$refs['ruleForm'].validate((valid) => {
-        if(valid) {
+        if (valid) {
           this.loading = true;
-          if(this.pageType == 'change') {
+          if (this.pageType == 'change') {
-            assetOfficialAccount('put',this.ruleForm).then(res=>{
+            assetOfficialAccount('put', this.ruleForm).then(res => {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("修改成功");
               // this.$router.go(-1);
-              this.$router.push({name:'OfficialAccount',params: this.queryData})
+              this.$router.push({ name: 'OfficialAccount', params: this.queryData })
             })
           } else {
-            assetOfficialAccount('post',this.ruleForm).then(res=>{
+            assetOfficialAccount('post', this.ruleForm).then(res => {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("新增成功");
@@ -494,9 +477,9 @@ export default {
         }
       })
     },
-    sendBack(){
+    sendBack() {
       // this.$router.go(-1);
-      this.$router.push({name:'OfficialAccount',params: this.queryData})
+      this.$router.push({ name: 'OfficialAccount', params: this.queryData })
     },
   },
 }

src/views/components/assetsType/index_v3.vue

@@ -214,6 +214,8 @@
 </template>
 <script>
 import { assetEmail, assetEmailInfo, unitAllList } from "@/api/auditPagesApi/index";
+import equalToPassword from '@/views/components/assetsType/mainx.js'
+
 export default {
   dicts:['app_xzqh','app_sshy','app_zdhy','email_jslx','email_state','email_hasorno'],
   data() {
@@ -223,7 +225,9 @@ export default {
       },
       rules:{
         ssdw:[
-          { required: true, message: "所属单位不能为空", trigger: "blur" }
+          { required: true, message: "所属单位不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "change" }
+
         ],
         dzyxhz:[
           { required: true, message: "电子邮箱后缀不能为空", trigger: "blur" }

src/views/components/assetsType/index_v4.vue

@@ -190,6 +190,8 @@
 </template>
 <script>
 import { assetApp, assetAppInfo, unitAllList } from "@/api/auditPagesApi/index";
+import equalToPassword from '@/views/components/assetsType/mainx.js'
+
 export default {
   dicts:['app_icp_state','app_sshy','app_zdhy','app_xzqh','app_aqjgqk','gzh_state'],
   data() {
@@ -199,7 +201,9 @@ export default {
       },
       rules:{
         ssdw:[
-          { required: true, message: "所属单位不能为空", trigger: "blur" }
+          { required: true, message: "所属单位不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "change" }
+
         ],
         appName:[
           { required: true, message: "移动应用名称不能为空", trigger: "blur" }

src/views/components/assetsType/mainx.js

@@ -0,0 +1,24 @@
+
+import { unitAllList } from "@/api/auditPagesApi/index";
+
+const equalToPassword = (rule, value, callback) => {
+    console.log("出发出发");
+    console.log(rule);
+    console.log(value);
+
+    unitAllList({ nickName: value }).then(res => {
+        if (res.data.length != 1) {
+            callback(new Error("请输入正确的单位名称"));
+        } else {
+            if (value == res.data[0].nickName) {
+                callback();
+            } else {
+                callback(new Error("请输入正确的单位名称"));
+
+            }
+
+        }
+    })
+};
+
+export default equalToPassword

src/views/components/myAssetsType/index.vue

@@ -2638,11 +2638,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
-                <el-form-item label="是否涉密数据" required :prop="`sjzcSmsj`" :rules="{
+                <el-form-item label="数据量单位" required :prop="`sjzcSjldw`" :rules="{
                   required: true, message: '请输入', trigger: 'blur'
                 }">
-                  <el-select v-model="ruleForm.sjzcSmsj" placeholder="请选择是否涉密数据">
+                  <el-select v-model="ruleForm.sjzcSjldw" placeholder="请选择数据量单位">
-                    <el-option v-for="dict in dict.type.is_no" :key="dict.value" :label="dict.label"
+                    <el-option v-for="dict in dict.type.sjzc_sjldw" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
                   </el-select>
                 </el-form-item>
@@ -2661,7 +2661,7 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据分级分类" required :prop="`sjzcSjfjfl`" :rules="{
-                  required: true, message: '请输入', trigger: 'blur'
+                  required: true, message: '请输入', trigger: 'change'
                 }">
                   <el-select v-model="ruleForm.sjzcSjfjfl" placeholder="请选择数据分级分类">
                     <el-option v-for="dict in dict.type.sjzc_sjfjfl" :key="dict.value" :label="dict.label"
@@ -2681,6 +2681,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="12" style="margin-left: 10px;">
+                <el-form-item label="是否涉密数据" required :prop="`sjzcSmsj`" :rules="{
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
+                  <el-select v-model="ruleForm.sjzcSmsj" placeholder="请选择是否涉密数据">
+                    <el-option v-for="dict in dict.type.is_no" :key="dict.value" :label="dict.label"
+                      :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row style="display: flex;">
               <el-col :span="24">
@@ -2772,7 +2782,7 @@ export default {
     'zc_yhgm','zc_xtbsfs','zc_hlwkfyt','fgfw','wlxz','ywlx','hlqk','fwdx',
     'fwfw','dbxx_dbdj','dbxx_zjps','sf_cpszsdj','sjzc_gxsx','sjzc_kfsx','sjzc_sjly',
     'sjzc_gxzq','sjzc_sjfjfl','fwq_czxt','wlw_fwdx','wlw_wlhlqk','wlw_fwfw','dwlx','sb_ip',
-    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls', 'database_type'
+    'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls', 'database_type',"sjzc_sjldw"
   ],
   components:{
     myUpload,

src/views/components/myAssetsType/index_v2.vue

@@ -6,28 +6,21 @@
         <span class="top-title-box">基本信息</span>
       </el-row>
       <div class="assets-info-box">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="170px" class="demo-ruleForm" label-position="right" :disabled="disabled">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="170px" class="demo-ruleForm"
+          label-position="right" :disabled="disabled">
           <el-row>
             <el-col :span="12">
               <el-form-item label="所属单位" prop="ssdw">
                 <!-- <el-input v-model="ruleForm.ssdw" placeholder="请输入单位名称"></el-input> -->
-                <el-autocomplete
+                <el-autocomplete v-model="ruleForm.ssdw" :fetch-suggestions="querySearchAsync" placeholder="请输入所属单位"
-                  v-model="ruleForm.ssdw"
+                  disabled></el-autocomplete>
-                  :fetch-suggestions="querySearchAsync"
-                  placeholder="请输入所属单位"
-                  disabled
-                ></el-autocomplete>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="平台类型" prop="ptlx" required>
-                <el-select v-model="ruleForm.ptlx" disabled placeholder="请选择平台类型" >
+                <el-select v-model="ruleForm.ptlx" disabled placeholder="请选择平台类型">
-                  <el-option 
+                  <el-option v-for="dict in dict.type.sys_ptlx_type" :key="dict.value" :label="dict.label"
-                    v-for="dict in dict.type.sys_ptlx_type" 
+                    :value="dict.value" />
-                    :key="dict.value" 
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -35,89 +28,68 @@
           <div v-if="ruleForm.ptlx == '1'">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="微信号"  prop="wxh">
+                <el-form-item label="微信号" prop="wxh">
                   <el-input v-model="ruleForm.wxh" style="width: 100%;" placeholder="请输入微信号"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="公众号名称" prop="gzhmc"
+                <el-form-item label="公众号名称" prop="gzhmc" :rules="[
-                  :rules="[
+                  { required: true, message: '公众号名称不能为空', trigger: 'blur' }
-                    { required: true, message: '公众号名称不能为空', trigger: 'blur' }
+                ]">
-                  ]"
-                >
                   <el-input v-model="ruleForm.gzhmc" placeholder="请输入公众号名称" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="12" >
+              <el-col :span="12">
-                  <el-form-item prop="tyshxydm"
+                <el-form-item prop="tyshxydm" class="daoqitixingren" label="统一社会信用代码" required :rules="[
-                  class="daoqitixingren" label="统一社会信用代码" required
+                  {
-                    :rules="[
+                    required: true,
-                      {
+
-                        required: true,
+                    pattern: /^[a-zA-Z0-9]{18}$/,
-  
+                    message: '请输入正确格式的18位统一社会信用代码',
-                        pattern: /^[a-zA-Z0-9]{18}$/,
+                    trigger: 'change'
-                        message: '请输入正确格式的18位统一社会信用代码',
+                  }
-                        trigger: 'change'
+                ]">
-                      }
+                  <el-input v-model="ruleForm.tyshxydm" placeholder="请输入统一信用代码"></el-input>
-                    ]"
+                </el-form-item>
-                  >
-                    <el-input v-model="ruleForm.tyshxydm" placeholder="请输入统一信用代码"></el-input>
-                  </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="公众号状态"  prop="gzhzt">
+                <el-form-item label="公众号状态" prop="gzhzt">
                   <el-select v-model="ruleForm.gzhzt" placeholder="请选择公众号状态">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_state" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_state"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="公众号ID"  prop="gzhId">
+                <el-form-item label="公众号ID" prop="gzhId">
                   <el-input v-model="ruleForm.gzhId" style="width: 100%;" placeholder="请输入公众号ID"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="公众号类型"  prop="gzhlx">
+                <el-form-item label="公众号类型" prop="gzhlx">
                   <el-select v-model="ruleForm.gzhlx" placeholder="请选择公众号类型">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_lx" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_lx"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="认证状态"  prop="rzState">
+                <el-form-item label="认证状态" prop="rzState">
                   <el-select v-model="ruleForm.rzState" placeholder="请选择认证状态">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_rzzt" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_rzzt"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="认证时间"  prop="rzsj">
+                <el-form-item label="认证时间" prop="rzsj">
-                  <el-date-picker
+                  <el-date-picker v-model="ruleForm.rzsj" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                    v-model="ruleForm.rzsj"
-                    type="date"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
                     placeholder="选择日期">
                   </el-date-picker>
                 </el-form-item>
@@ -125,275 +97,246 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="认证类型"  prop="rzlx">
+                <el-form-item label="认证类型" prop="rzlx">
                   <el-select v-model="ruleForm.rzlx" placeholder="请选择认证类型">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_rzlx" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_rzlx"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="所属行业"  prop="sshy">
+                <el-form-item label="所属行业" prop="sshy">
                   <el-select v-model="ruleForm.sshy" placeholder="请选择所属行业">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_sshy" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_sshy"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="重点行业"  prop="zdhy">
+                <el-form-item label="重点行业" prop="zdhy">
                   <el-select v-model="ruleForm.zdhy" placeholder="请选择重点行业">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_zdhy" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_zdhy"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="行政区划"  prop="xzqh">
+                <el-form-item label="行政区划" prop="xzqh">
                   <el-select v-model="ruleForm.xzqh" placeholder="请选择行政区划">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_xzqh" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_xzqh"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="系统责任人"  prop="xtzrr">
+                <el-form-item label="系统责任人" prop="xtzrr">
                   <el-input v-model="ruleForm.xtzrr" style="width: 100%;" placeholder="请输入系统责任人"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                  <el-form-item prop="xtzrrdh"
+                <el-form-item prop="xtzrrdh" label="系统责任人电话" required :rules="[
-                  label="系统责任人电话" required
+                  {
-                    :rules="[
+                    required: true,
-                      {
+
-                        required: true,
+                    pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-  
+                    message: '请输入正确的手机号码',
-                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                    trigger: 'change'
-                        message: '请输入正确的手机号码',
+                  }
-                        trigger: 'change'
+                ]">
-                      }
+                  <el-input v-model="ruleForm.xtzrrdh" style="width: 100%;" placeholder="请输入系统责任人电话"></el-input>
-                    ]"
-                  >
-                    <el-input v-model="ruleForm.xtzrrdh" style="width: 100%;" placeholder="请输入系统责任人电话"></el-input>
-                  </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                  <el-form-item prop="xtzrryx"
-                  label="系统责任人邮箱" required
-                    :rules="[
-                      {
-                        required: true,
-  
-                        type: 'email',
-                        message: '请输入正确的邮箱地址',
-                        trigger: ['change', 'change']
-                      }
-                    ]"
-                  >
-                    <el-input v-model="ruleForm.xtzrryx" style="width: 100%;" placeholder="请输入系统责任人邮箱"></el-input>
-                  </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="系统责任人地址"  prop="xtzrrdz">
-                  <el-input v-model="ruleForm.xtzrrdz" style="width: 100%;" placeholder="请输入系统责任人地址"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="菜单信息（菜单名称）"  prop="cdmc">
+                <el-form-item prop="xtzrryx" label="系统责任人邮箱" required :rules="[
-                  <el-input v-model="ruleForm.cdmc" style="width: 100%;" placeholder="请输入菜单信息（菜单名称）"></el-input>
+                  {
+                    required: true,
+
+                    type: 'email',
+                    message: '请输入正确的邮箱地址',
+                    trigger: ['change', 'change']
+                  }
+                ]">
+                  <el-input v-model="ruleForm.xtzrryx" style="width: 100%;" placeholder="请输入系统责任人邮箱"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="菜单信息（菜单链接）"  prop="cdlj">
+                <el-form-item label="系统责任人地址" prop="xtzrrdz">
-                  <el-input v-model="ruleForm.cdlj" style="width: 100%;" placeholder="请输入菜单信息（菜单链接）"></el-input>
+                  <el-input v-model="ruleForm.xtzrrdz" style="width: 100%;" placeholder="请输入系统责任人地址"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row>
+
               <el-col :span="12">
-                <el-form-item label="菜单信息（菜单类型）"  prop="cdlx">
+                <el-form-item label="认证主体" prop="rzzt">
-                  <el-input v-model="ruleForm.cdlx" style="width: 100%;" placeholder="请输入菜单信息（菜单类型）"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="认证主体"   prop="rzzt">
                   <el-input v-model="ruleForm.rzzt" style="width: 100%;" placeholder="请输入认证主体"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="系统简介"  prop="xtjj">
+                <el-form-item label="系统简介" prop="xtjj">
-                  <el-input type="textarea" resize="none" placeholder="请输入系统简介" :rows="5" v-model="ruleForm.xtjj"></el-input>
+                  <el-input type="textarea" resize="none" placeholder="请输入系统简介" :rows="5"
+                    v-model="ruleForm.xtjj"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
+            <!-- 菜单信息 -->
+            <div>
+              <el-row>
+                <span class="top-title-box">菜单信息</span>
+              </el-row>
+              <el-row v-for="(domain, index) in ruleForm.cdList">
+                <el-col :span="12">
+                  <el-form-item :label="'菜单名称' + (index == 0 ? '' : index)" required :prop="'cdList.' + index + '.cdmc'"
+                    :rules="{ required: true, message: '菜单名称不能为空', trigger: 'blur'} ">
+                    <el-input v-model="domain.cdmc" style="width: 100%;" placeholder="请输入菜单名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item :label="'菜单链接' + (index == 0 ? '' : index)" required
+                    :prop="'cdList.' + index + '.cdlj'" :rules="{ required: true, message: '菜单链接不能为空', trigger: 'blur'} ">
+                    <el-input v-model="domain.cdlj" style="width: 100%;" placeholder="请输入菜单链接"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item :label="'菜单类型' + (index == 0 ? '' : index)" required
+                    :prop="'cdList.' + index + '.cdlj'" :rules="{ required: true, message: '菜单类型不能为空', trigger: 'blur'} ">
+                    <el-select v-model="domain.cdlx" placeholder="请选择菜单类型">
+                      <el-option v-for="dict in dict.type.gzh_cdlx" :key="dict.value" :label="dict.label"
+                        :value="dict.value" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="1" style="text-align: center; " v-if="!disabled" v-show="index != 0">
+                  <i @click="removeDomain(domain, 'cdList')" class="el-icon-remove-outline"
+                    style="font-size: 16px;cursor: pointer;margin-top: 8px;"></i>
+                </el-col>
+              </el-row>
+              <el-row v-if="pageType !== 'look'">
+                <el-col :span="24">
+                  <el-form-item>
+                    <el-button @click="addOtherConcat('cdList')">添加菜单</el-button>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
           </div>
           <div v-else>
             <el-row>
               <el-col :span="12">
                 <!-- <el-form-item> -->
-                  <el-form-item prop="tyshxydm"  class="daoqitixingren" label="统一社会信用代码" required
+                <el-form-item prop="tyshxydm" class="daoqitixingren" label="统一社会信用代码" required :rules="[
-                    :rules="[
+                  {
-                      {
+                    pattern: /^[a-zA-Z0-9]{18}$/,
-                        pattern: /^[a-zA-Z0-9]{18}$/,
+                    message: '请输入正确格式的18位统一社会信用代码',
-                        message: '请输入正确格式的18位统一社会信用代码',
+                    trigger: 'blur'
-                        trigger: 'blur'
+                  }
-                      }
+                ]">
-                    ]"
+                  <el-input v-model="ruleForm.tyshxydm" placeholder="请输入统一信用代码"></el-input>
-                  >
+                </el-form-item>
-                    <el-input v-model="ruleForm.tyshxydm" placeholder="请输入统一信用代码"></el-input>
-                  </el-form-item>
                 <!-- </el-form-item> -->
               </el-col>
               <el-col :span="12">
-                <el-form-item label="账号名称" prop="gzhmc"
+                <el-form-item label="账号名称" prop="gzhmc" :rules="[
-                  :rules="[
+                  { required: true, message: '账号名称不能为空', trigger: 'blur' }
-                    { required: true, message: '账号名称不能为空', trigger: 'blur' }
+                ]">
-                  ]"
-                >
                   <el-input v-model="ruleForm.gzhmc" placeholder="请输入账号名称"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="账号ID" required prop="gzhId"
+                <el-form-item label="账号ID" required prop="gzhId" :rules="[
-                  :rules="[
+                  { required: true, message: '账号名称不能为空', trigger: 'blur' }
-                    { required: true, message: '账号名称不能为空', trigger: 'blur' }
+                ]">
-                  ]"
-                >
                   <el-input v-model="ruleForm.gzhId" style="width: 100%;" placeholder="请输入账号ID"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="账号状态" required 
+                <el-form-item label="账号状态" required prop="gzhzt" :rules="[
-                  prop="gzhzt"
+                  { required: true, message: '账号状态不能为空', trigger: 'blur' }
-                  :rules="[
+                ]">
-                    { required: true, message: '账号状态不能为空', trigger: 'blur' }
-                  ]"
-                >
                   <el-select v-model="ruleForm.gzhzt" placeholder="请选择账号状态">
-                    <el-option
+                    <el-option v-for="dict in dict.type.gzh_state" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.gzh_state"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="开办主体" required
+                <el-form-item label="开办主体" required prop="rzzt" :rules="[
-                  prop="rzzt"
+                  { required: true, message: '开办主体不能为空', trigger: 'blur' }
-                  :rules="[
+                ]">
-                    { required: true, message: '开办主体不能为空', trigger: 'blur' }
-                  ]"
-                >
                   <el-input v-model="ruleForm.rzzt" style="width: 100%;" placeholder="请输入开办主体"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="粉丝数" required
+                <el-form-item label="粉丝数" required prop="fss" :rules="[
-                  prop="fss"
+                  { required: true, message: '粉丝数不能为空', trigger: 'blur' }
-                  :rules="[
+                ]">
-                    { required: true, message: '粉丝数不能为空', trigger: 'blur' }
-                  ]"
-                >
                   <el-input v-model="ruleForm.fss" type="number" style="width: 100%;" placeholder="请输入粉丝数"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="重点行业" required 
+                <el-form-item label="重点行业" required prop="zdhy">
-                  prop="zdhy"
-                >
                   <el-select v-model="ruleForm.zdhy" placeholder="请选择重点行业">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_zdhy" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_zdhy"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="所属行业" required prop="sshy">
                   <el-select v-model="ruleForm.sshy" placeholder="请选择所属行业">
-                    <el-option
+                    <el-option v-for="dict in dict.type.app_sshy" :key="dict.value" :label="dict.label"
-                      v-for="dict in dict.type.app_sshy"
+                      :value="dict.value" />
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="系统责任人" required  prop="xtzrr">
+                <el-form-item label="系统责任人" required prop="xtzrr">
                   <el-input v-model="ruleForm.xtzrr" style="width: 100%;" placeholder="请输入系统责任人"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <!-- <el-form-item label="系统责任人电话" required> -->
-                  <el-form-item prop="xtzrrdh" label="系统责任人电话" required
+                <el-form-item prop="xtzrrdh" label="系统责任人电话" required :rules="[
-                    :rules="[
+                  {
-                      {
+                    pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                    message: '请输入正确的手机号码',
-                        message: '请输入正确的手机号码',
+                    trigger: 'blur'
-                        trigger: 'blur'
+                  }
-                      }
+                ]">
-                    ]"
+                  <el-input v-model="ruleForm.xtzrrdh" style="width: 100%;" placeholder="请输入系统责任人电话"></el-input>
-                  >
+                </el-form-item>
-                    <el-input v-model="ruleForm.xtzrrdh" style="width: 100%;" placeholder="请输入系统责任人电话"></el-input>
-                  </el-form-item>
                 <!-- </el-form-item> -->
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
                 <!-- <el-form-item> -->
-                  <el-form-item prop="xtzrryx" label="系统责任人邮箱" required
+                <el-form-item prop="xtzrryx" label="系统责任人邮箱" required :rules="[
-                    :rules="[
+                  {
-                      {
+                    type: 'email',
-                        type: 'email',
+                    message: '请输入正确的邮箱地址',
-                        message: '请输入正确的邮箱地址',
+                    trigger: ['blur', 'change']
-                        trigger: ['blur', 'change']
+                  }
-                      }
+                ]">
-                    ]"
+                  <el-input v-model="ruleForm.xtzrryx" style="width: 100%;" placeholder="请输入系统责任人邮箱"></el-input>
-                  >
+                </el-form-item>
-                    <el-input v-model="ruleForm.xtzrryx" style="width: 100%;" placeholder="请输入系统责任人邮箱"></el-input>
-                  </el-form-item>
                 <!-- </el-form-item> -->
               </el-col>
               <el-col :span="12">
@@ -405,12 +348,14 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="系统简介" required prop="xtjj">
-                  <el-input type="textarea" resize="none" placeholder="请输入系统简介" :rows="5" v-model="ruleForm.xtjj"></el-input>
+                  <el-input type="textarea" resize="none" placeholder="请输入系统简介" :rows="5"
+                    v-model="ruleForm.xtjj"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
           </div>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'change' && !audit">
+          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+            v-if="pageType == 'change' && !audit">
             <el-button type="danger" @click="sendBack">取消</el-button>
             <el-button type="primary" @click="newAssets" :loading="loading">提交</el-button>
           </el-row>
@@ -446,20 +391,26 @@
 import { assetOfficialAccount, assetOfficialAccountInfo, unitAllList, gzhLookInfo, gzhAudit, gzhUnitEdit } from "@/api/auditPagesApi/index";
 import myDialog from "@/views/components/myDialog/index.vue"
 export default {
-  dicts:['app_xzqh','app_sshy','app_zdhy','gzh_state','gzh_lx','gzh_rzzt','gzh_rzlx','gzh_cdlx','sys_ptlx_type'],
+  dicts: ['app_xzqh', 'app_sshy', 'app_zdhy', 'gzh_state', 'gzh_lx', 'gzh_rzzt', 'gzh_rzlx', 'gzh_cdlx', 'sys_ptlx_type'],
-  components:{
+  components: {
     myDialog
   },
   data() {
     return {
-      ruleForm:{
+      ruleForm: {
-
+        cdList: [
+          {
+            cdmc: "",
+            cdlj: "",
+            cdlx: "",
+          }
+        ]
       },
-      rules:{
+      rules: {
-        ssdw:[
+        ssdw: [
           { required: true, message: "所属单位不能为空", trigger: "blur" }
         ],
-        gzhmc:[
+        gzhmc: [
           { required: true, message: "公众号名称不能为空", trigger: "blur" }
         ],
         wxh: [
@@ -513,38 +464,38 @@ export default {
         xtzrrdz: [
           { required: true, message: "系统责任人地址不能为空", trigger: "blur" }
         ],
-        cdmc: [
+        // cdmc: [
-          { required: true, message: "菜单信息（菜单名称）不能为空", trigger: "blur" }
+        //   { required: true, message: "菜单信息（菜单名称）不能为空", trigger: "blur" }
-        ],
+        // ],
-        cdlj: [
+        // cdlj: [
-          { required: true, message: "菜单信息（菜单链接）不能为空", trigger: "blur" }
+        //   { required: true, message: "菜单信息（菜单链接）不能为空", trigger: "blur" }
-        ],
+        // ],
-        cdlx: [
+        // cdlx: [
-          { required: true, message: "菜单信息（菜单类型）不能为空", trigger: "blur" }
+        //   { required: true, message: "菜单信息（菜单类型）不能为空", trigger: "blur" }
-        ],
+        // ],
         xtjj: [
           { required: true, message: "系统简介不能为空", trigger: "blur" }
         ]
       },
-      loading:false,
+      loading: false,
-      disabled:false,
+      disabled: false,
-      dialogruleForm:{
+      dialogruleForm: {
-        auditYy:'',
+        auditYy: '',
       },
-      dialogruleFormrules:{
+      dialogruleFormrules: {
         auditYy: [
           { required: true, message: '请输入', trigger: 'blur' },
         ],
       },
     }
   },
-  props:['pageType', 'id', 'audit', 'isModdle', 'name', 'queryData'],
+  props: ['pageType', 'id', 'audit', 'isModdle', 'name', 'queryData'],
-  mounted(){
+  mounted() {
-    if(this.isModdle) {
+    if (this.isModdle) {
-      if(this.pageType == 'look') {
+      if (this.pageType == 'look') {
         this.getInfoTwo(this.id)
         this.disabled = true;
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           const inputElements = document.querySelectorAll('.el-input__inner');
           const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
           inputElements.forEach((input) => {
@@ -554,18 +505,18 @@ export default {
             input.placeholder = '';
           });
         })
-      } else if(this.pageType == 'change') {
+      } else if (this.pageType == 'change') {
         this.getInfoTwo(this.id)
         this.disabled = false;
       }
-      if(this.audit) {
+      if (this.audit) {
         this.disabled = true;
       }
     } else {
-      if(this.pageType == 'look') {
+      if (this.pageType == 'look') {
         this.getInfo(this.id)
         this.disabled = true;
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           const inputElements = document.querySelectorAll('.el-input__inner');
           const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
           inputElements.forEach((input) => {
@@ -575,20 +526,35 @@ export default {
             input.placeholder = '';
           });
         })
-      } else if(this.pageType == 'change') {
+      } else if (this.pageType == 'change') {
         this.getInfo(this.id)
         this.disabled = false;
       }
-      if(this.audit) {
+      if (this.audit) {
         this.disabled = true;
       }
     }
   },
-  methods:{
+  methods: {
-    getInfo(id){
+    removeDomain(item, type) {
-      assetOfficialAccountInfo(id).then(res=>{
+      var index = this.ruleForm[type].indexOf(item)
+      if (index !== -1) {
+        this.ruleForm[type].splice(index, 1)
+      }
+    },
+    // 新增其他联系人
+    addOtherConcat(type) {
+      this.ruleForm[type].push({
+        cdmc: "",
+        cdlj: "",
+        cdlx: "",
+        // key: Date.now()
+      });
+    },
+    getInfo(id) {
+      assetOfficialAccountInfo(id).then(res => {
         this.ruleForm = res.data;
-        if(!this.ruleForm.ptlx) {
+        if (!this.ruleForm.ptlx) {
           this.ruleForm.ptlx = '1'
         }
         setTimeout(() => {
@@ -596,10 +562,10 @@ export default {
         }, 100);
       })
     },
-    getInfoTwo(id){
+    getInfoTwo(id) {
-      gzhLookInfo(id).then(res=>{
+      gzhLookInfo(id).then(res => {
         this.ruleForm = res.data;
-        if(!this.ruleForm.ptlx) {
+        if (!this.ruleForm.ptlx) {
           this.ruleForm.ptlx = '1'
         }
         setTimeout(() => {
@@ -608,9 +574,9 @@ export default {
       })
     },
     // 单位名称模糊查询
-    querySearchAsync(queryString, cb){
+    querySearchAsync(queryString, cb) {
       let results = [];
-      unitAllList({nickName: queryString}).then(res => {
+      unitAllList({ nickName: queryString }).then(res => {
         res.data.forEach(item => {
           results.push({
             value: item.nickName,
@@ -621,20 +587,20 @@ export default {
       cb(results);
     },
     // 新增资产确认按钮
-    newAssets(){
+    newAssets() {
       this.$refs['ruleForm'].validate((valid) => {
-        if(valid) {
+        if (valid) {
           this.loading = true;
-          if(this.pageType == 'change') {
+          if (this.pageType == 'change') {
-            gzhUnitEdit(this.ruleForm).then(res=>{
+            gzhUnitEdit(this.ruleForm).then(res => {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
               // this.$router.go(-1);
-              this.$router.push({name:this.name,params: this.queryData})
+              this.$router.push({ name: this.name, params: this.queryData })
             })
           } else {
-            assetOfficialAccount('post',this.ruleForm).then(res=>{
+            assetOfficialAccount('post', this.ruleForm).then(res => {
               // console.log(res,"res");
               this.loading = false;
               this.$modal.msgSuccess("新增成功");
@@ -644,18 +610,18 @@ export default {
         }
       })
     },
-    sendBack(){
+    sendBack() {
       // this.$router.go(-1);
-      this.$router.push({name:this.name,params: this.queryData})
+      this.$router.push({ name: this.name, params: this.queryData })
     },
     // 驳回按钮
-    btnReject(){
+    btnReject() {
       this.$refs.liebiaoDialog.open()
     },
     // 驳回输入驳回原因点击取消按钮
     resetForm() {
       this.dialogruleForm = {
-        auditYy:""
+        auditYy: ""
       }
       this.$refs.liebiaoDialog.close()
     },
@@ -668,11 +634,11 @@ export default {
             auditYy: this.dialogruleForm.auditYy,
             currentId: Number(this.id),
           }
-          gzhAudit(tijioaobj).then(res=>{
+          gzhAudit(tijioaobj).then(res => {
-            if(res.code == 200){
+            if (res.code == 200) {
               this.$modal.msgSuccess("审核驳回");
               // this.$router.go(-1);
-              this.$router.push({name:this.name,params: this.queryData})
+              this.$router.push({ name: this.name, params: this.queryData })
             }
           })
         } else {
@@ -682,14 +648,14 @@ export default {
       });
     },
     // 通过按钮
-    btnPass(){
+    btnPass() {
       this.loading = true;
-      gzhAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
+      gzhAudit({ currentId: Number(this.id), auditState: "2" }).then(res => {
         this.$modal.msgSuccess("审核通过");
         // this.$router.go(-1);
-        this.$router.push({name:this.name,params: this.queryData})
+        this.$router.push({ name: this.name, params: this.queryData })
         this.loading = false;
-      }).catch(err=>{
+      }).catch(err => {
         this.loading = false;
       })
     },

src/views/components/myUpload/index.vue

@@ -67,10 +67,10 @@ export default {
     return {
       number: 0,
       uploadList: [],
-      baseUrl: process.env.VUE_APP_BASE_API,
+      // baseUrl: process.env.VUE_APP_BASE_API,
-      // baseUrl: location.origin + '/api',
+      baseUrl: location.origin + '/api',
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
+      // uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
-      // uploadFileUrl: location.origin + '/api/common/upload',
+      uploadFileUrl: location.origin + '/api/common/upload',
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/views/components/renwuType/butongguo.vue

@@ -44,7 +44,7 @@ export default {
   },
   created () { },
   mounted () { },
-  props:['chuandemingcheng', 'assetTaskzc'],
+  props:['chuandemingcheng', 'assetTaskzc',"dataname","ruleForm"],
   methods: {
     importClose(){},
     resetForm() {
@@ -70,6 +70,7 @@ export default {
           status: 4,
           type:this.$route.query.type
         }
+        tijioaobj[this.dataname] = this.ruleForm
           assetTasksh(tijioaobj).then(res=>{
           if(res.code == 200){
             this.$modal.msgSuccess("审核成功");

src/views/components/renwuType/index_v1.vue

@@ -18,7 +18,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="小程序名称" prop="xcxmc">
-                <el-input v-model="ruleForm.xcxmc" placeholder="请输入小程序名称" disabled></el-input>
+                <el-input v-model="ruleForm.xcxmc" placeholder="请输入小程序名称"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -215,26 +215,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="ruleForm.bfyy">
+          <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
-            <el-col :span="24">
+            <span class="top-title-box">关停原因</span>
-              <el-form-item label="关停原因">
+          </el-row>
-                                <div>{{ ruleForm.bfyy }}</div>
+          <el-row style="margin: 20px 0;">
-                              </el-form-item>
+            <el-form-item>
-            </el-col>
+              <div>{{ ruleForm.bfyy }}</div>
+            </el-form-item>
           </el-row>
-         
+
         </el-form>
 
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
-            v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
+          v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
-            <el-button type="danger" @click="newAssets(0)">关停</el-button>
+          <el-button type="danger" @click="newAssets(0)">关停</el-button>
-            <el-button @click="newAssets(1)">取消</el-button>
+          <el-button @click="newAssets(1)">取消</el-button>
-            <el-button type="warning" @click="newAssets(2)">暂存</el-button>
+          <el-button type="warning" @click="newAssets(2)">暂存</el-button>
-            <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
+          <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
           <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
-          </el-row>
+        </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
-          v-if="pageType == 'look'">
           <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
         </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
@@ -243,22 +243,24 @@
           <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
           <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
         </el-row>
-       
+
       </div>
     </div>
     <baofei ref='baofei' :ruleForm='ruleForm' @assetTaskzc="guanting"></baofei>
-    <butongguo ref='butongguo' :chuandemingcheng='ruleForm.xcxmc'></butongguo>
+    <butongguo ref='butongguo' :chuandemingcheng='ruleForm.xcxmc' :ruleForm="this.ruleForm"
+      dataname="assetMiniProgramsCpPo"></butongguo>
   </div>
 </template>
 <script>
 import { assetMiniPrograms, miniProgramsInfo, unitAllList } from "@/api/auditPagesApi/index";
-import { assetTaskminitaskSh, assetTaskxcxzc, assetTasksh, assetTaskxcxjyTj } from "@/api/renwuApi/index.js"
+import { assetTaskminitaskSh, assetTaskxcxzc, assetTasksh, assetTaskxcxjyTj, assetTaskhistory } from "@/api/renwuApi/index.js"
 import baofei from "@/views/components/renwuType/baofei.vue"
 import butongguo from "@/views/components/renwuType/butongguo.vue"
-
+import myMixin from '@/views/components/renwuType/minxfanhui.js';
 export default {
   dicts: ['app_xzqh', 'app_sshy', 'app_zdhy', 'gzh_state', 'gzh_rzzt', 'gzh_rzlx', 'email_state'],
   components: { baofei, butongguo },
+  mixins: [myMixin],
   data() {
     return {
       ruleForm: {
@@ -361,32 +363,42 @@ export default {
       this.getInfo()
       this.disabled = false;
     }
-    if (this.$route.query.taskInfo == 'taskInfo') {
+    // if (this.$route.query.taskInfo == 'taskInfo') {
-      this.disabled = true;
+    //   this.disabled = true;
-    }
+    // }
   },
   methods: {
-    sendBack() {
+
-      if (localStorage.getItem('ismypaginationTow')) {
-        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
-        formInline.isfanhuiTow = true
-        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
-      }
-      this.$router.go(-1);
-    },
     getInfo(id) {
-      let obj = {
+      if (this.$route.query.istijiaoshow) {
-        taskId: this.$route.query.taskId,
+
-        assetId: this.$route.query.assetId
+        let obj = {
+          id: this.$route.query.assetId,
+          type: this.$route.query.type
+        }
+        assetTaskhistory(obj).then(res => {
+          this.ruleForm = res.data.assetMiniProgramsHistory;
+
+          console.log(111);
+          setTimeout(() => {
+            this.$refs.ruleForm.clearValidate()
+          }, 100);
+        })
+      } else {
+        let obj = {
+          taskId: this.$route.query.taskId,
+          assetId: this.$route.query.assetId
+        }
+        assetTaskminitaskSh(obj).then(res => {
+          this.ruleForm = res.data;
+
+          console.log(111);
+          setTimeout(() => {
+            this.$refs.ruleForm.clearValidate()
+          }, 100);
+        })
       }
-      assetTaskminitaskSh(obj).then(res => {
-        this.ruleForm = res.data;
 
-        console.log(111);
-        setTimeout(() => {
-          this.$refs.ruleForm.clearValidate()
-        }, 100);
-      })
     },
     // 单位名称模糊查询
     querySearchAsync(queryString, cb) {
@@ -461,28 +473,37 @@ export default {
       this.ruleForm.taskId = this.$route.query.taskId
       this.ruleForm.assetId = this.$route.query.assetId
       if (type == 0) {
+        this.$refs['ruleForm'].validate((valid) => {
 
-        this.$refs.butongguo.open()
+          this.$refs.butongguo.open()
 
+        })
       }
       if (type == 1) {
-        let tijioaobj = {
+
-          taskId: this.$route.query.taskId,
+        this.$refs['ruleForm'].validate((valid) => {
-          assetId: this.$route.query.assetId,
+          if (valid) {
-          xtmc: this.ruleForm.xcxmc,
+            let tijioaobj = {
-          status: 3,
+              taskId: this.$route.query.taskId,
-          type: this.$route.query.type
+              assetId: this.$route.query.assetId,
-        }
+              xtmc: this.ruleForm.xcxmc,
-        assetTasksh(tijioaobj).then(res => {
+              status: 3,
-          if (res.code == 200) {
+              type: this.$route.query.type,
-            this.$modal.msgSuccess("审核成功");
+              assetMiniProgramsCpPo: this.ruleForm
-            this.$router.go(-1);
+            }
+            assetTasksh(tijioaobj).then(res => {
+              if (res.code == 200) {
+                this.$modal.msgSuccess("审核成功");
+                this.$router.go(-1);
+              }
+            })
           }
         })
+
       }
 
     },
-   
+
   },
 }
 </script>

src/views/components/renwuType/index_v2.vue

@@ -34,7 +34,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="公众号名称" prop="gzhmc">
-                  <el-input v-model="ruleForm.gzhmc" placeholder="请输入公众号名称" disabled></el-input>
+                  <el-input v-model="ruleForm.gzhmc" placeholder="请输入公众号名称"></el-input>
                 </el-form-item>
               </el-col>
 
@@ -170,24 +170,9 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row>
-              <el-col :span="12">
+
-                <el-form-item label="菜单信息（菜单名称）" prop="cdmc">
-                  <el-input v-model="ruleForm.cdmc" style="width: 100%;" placeholder="请输入菜单信息（菜单名称）"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="菜单信息（菜单链接）" prop="cdlj">
-                  <el-input v-model="ruleForm.cdlj" style="width: 100%;" placeholder="请输入菜单信息（菜单链接）"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="菜单信息（菜单类型）" prop="cdlx">
-                  <el-input v-model="ruleForm.cdlx" style="width: 100%;" placeholder="请输入菜单信息（菜单类型）"></el-input>
-                </el-form-item>
-              </el-col>
               <el-col :span="12">
                 <el-form-item label="认证主体" prop="rzzt">
                   <el-input v-model="ruleForm.rzzt" style="width: 100%;" placeholder="请输入认证主体"></el-input>
@@ -202,6 +187,45 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <div>
+              <el-row>
+                <span class="top-title-box">菜单信息</span>
+              </el-row>
+              <el-row v-for="(domain, index) in ruleForm.cdList">
+                <el-col :span="12">
+                  <el-form-item :label="'菜单名称' + (index == 0 ? '' : index)" required :prop="'cdList.' + index + '.cdmc'"
+                    :rules="{ required: true, message: '菜单名称不能为空', trigger: 'blur' }">
+                    <el-input v-model="domain.cdmc" style="width: 100%;" placeholder="请输入菜单名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item :label="'菜单链接' + (index == 0 ? '' : index)" required :prop="'cdList.' + index + '.cdlj'"
+                    :rules="{ required: true, message: '菜单链接不能为空', trigger: 'blur' }">
+                    <el-input v-model="domain.cdlj" style="width: 100%;" placeholder="请输入菜单链接"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item :label="'菜单类型' + (index == 0 ? '' : index)" required :prop="'cdList.' + index + '.cdlj'"
+                    :rules="{ required: true, message: '菜单类型不能为空', trigger: 'change' }">
+                    <el-select v-model="domain.cdlx" placeholder="请选择菜单类型">
+                      <el-option v-for="dict in dict.type.gzh_cdlx" :key="dict.value" :label="dict.label"
+                        :value="dict.value" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="1" style="text-align: center; " v-if="!disabled" v-show="index != 0">
+                  <i @click="removeDomain(domain, 'cdList')" class="el-icon-remove-outline"
+                    style="font-size: 16px;cursor: pointer;margin-top: 8px;"></i>
+                </el-col>
+              </el-row>
+              <el-row v-if="pageType !== 'look'">
+                <el-col :span="24">
+                  <el-form-item>
+                    <el-button @click="addOtherConcat('cdList')">添加菜单</el-button>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
           </div>
           <div v-else>
             <el-row>
@@ -304,26 +328,26 @@
               </el-col>
             </el-row>
           </div>
-          <el-row v-if="ruleForm.bfyy">
+          <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
-            <el-col :span="24">
+              <span class="top-title-box">关停原因</span>
-              <el-form-item label="关停原因">
+            </el-row>
-                                <div>{{ ruleForm.bfyy }}</div>
+            <el-row style="margin: 20px 0;">
-                              </el-form-item>
+              <el-form-item>
-            </el-col>
+                <div>{{ ruleForm.bfyy }}</div>
-          </el-row>
+              </el-form-item>
-         
+            </el-row>
+
         </el-form>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
-            v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
+          v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
-            <el-button type="danger" @click="newAssets(0)">关停</el-button>
+          <el-button type="danger" @click="newAssets(0)">关停</el-button>
-            <el-button @click="newAssets(1)">取消</el-button>
+          <el-button @click="newAssets(1)">取消</el-button>
-            <el-button type="warning" @click="newAssets(2)">暂存</el-button>
+          <el-button type="warning" @click="newAssets(2)">暂存</el-button>
-            <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
+          <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
-            <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
+          <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
-          </el-row>
+        </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
-          v-if="pageType == 'look'">
           <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
         </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
@@ -333,27 +357,36 @@
           <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
         </el-row>
-      
+
       </div>
     </div>
     <baofei ref='baofei' :ruleForm='ruleForm' @assetTaskzc="guanting"></baofei>
-    <butongguo ref='butongguo' :chuandemingcheng='ruleForm.gzhmc'></butongguo>
+    <butongguo ref='butongguo' :chuandemingcheng='ruleForm.gzhmc' :ruleForm="this.ruleForm" dataname="assetOfficialAccountCpPo"></butongguo>
   </div>
 </template>
 <script>
 import { assetOfficialAccount, assetOfficialAccountInfo, unitAllList } from "@/api/auditPagesApi/index";
-import { assetTaskofficetaskSh, assetTaskgzhzc, assetTasksh, assetTaskgzhjyTj } from "@/api/renwuApi/index.js"
+import { assetTaskofficetaskSh, assetTaskgzhzc, assetTasksh, assetTaskgzhjyTj ,assetTaskhistory} from "@/api/renwuApi/index.js"
 import baofei from "@/views/components/renwuType/baofei.vue"
 import butongguo from "@/views/components/renwuType/butongguo.vue"
+import myMixin from '@/views/components/renwuType/minxfanhui.js';
 
 export default {
+  mixins: [myMixin],
+
   components: { baofei, butongguo },
 
   dicts: ['app_xzqh', 'app_sshy', 'app_zdhy', 'gzh_state', 'gzh_lx', 'gzh_rzzt', 'gzh_rzlx', 'gzh_cdlx', 'sys_ptlx_type'],
   data() {
     return {
       ruleForm: {
-
+        cdList: [
+          {
+            cdmc: "",
+            cdlj: "",
+            cdlx: "",
+          }
+        ]
       },
       rules: {
         ssdw: [
@@ -413,15 +446,15 @@ export default {
         xtzrrdz: [
           { required: true, message: "系统责任人地址不能为空", trigger: "change" }
         ],
-        cdmc: [
+        // cdmc: [
-          { required: true, message: "菜单信息（菜单名称）不能为空", trigger: "change" }
+        //   { required: true, message: "菜单信息（菜单名称）不能为空", trigger: "change" }
-        ],
+        // ],
-        cdlj: [
+        // cdlj: [
-          { required: true, message: "菜单信息（菜单链接）不能为空", trigger: "change" }
+        //   { required: true, message: "菜单信息（菜单链接）不能为空", trigger: "change" }
-        ],
+        // ],
-        cdlx: [
+        // cdlx: [
-          { required: true, message: "菜单信息（菜单类型）不能为空", trigger: "change" }
+        //   { required: true, message: "菜单信息（菜单类型）不能为空", trigger: "change" }
-        ],
+        // ],
         xtjj: [
           { required: true, message: "系统简介不能为空", trigger: "change" }
         ]
@@ -450,34 +483,60 @@ export default {
       this.getInfo(this.id)
       this.disabled = false;
     }
-    if (this.$route.query.taskInfo == 'taskInfo') {
+    // if (this.$route.query.taskInfo == 'taskInfo') {
-      this.disabled = true;
+    //   this.disabled = true;
-    }
+    // }
   },
   methods: {
-    sendBack() {
+    removeDomain(item, type) {
-      if (localStorage.getItem('ismypaginationTow')) {
+      var index = this.ruleForm[type].indexOf(item)
-        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+      if (index !== -1) {
-        formInline.isfanhuiTow = true
+        this.ruleForm[type].splice(index, 1)
-        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
       }
-      this.$router.go(-1);
     },
+    // 新增其他联系人
+    addOtherConcat(type) {
+      this.ruleForm[type].push({
+        cdmc: "",
+        cdlj: "",
+        cdlx: "",
+        // key: Date.now()
+      });
+    },
+   
     getInfo(id) {
-      let obj = {
+
-        taskId: this.$route.query.taskId,
+      if (this.$route.query.istijiaoshow) {
-        assetId: this.$route.query.assetId
+
-      }
+        let obj = {
-      assetTaskofficetaskSh(obj).then(res => {
+          id: this.$route.query.assetId,
-        this.ruleForm = res.data;
+          type: this.$route.query.type
-        if (!this.ruleForm.ptlx) {
-          this.ruleForm.ptlx = '1'
         }
-        setTimeout(() => {
+        assetTaskhistory(obj).then(res => {
-          this.$refs.ruleForm.clearValidate()
+          this.ruleForm = res.data.assetOfficialAccountHistory;
+
+          console.log(111);
+          setTimeout(() => {
+            this.$refs.ruleForm.clearValidate()
+          }, 100);
+        })
+      } else {
+        let obj = {
+          taskId: this.$route.query.taskId,
+          assetId: this.$route.query.assetId
+        }
+        assetTaskofficetaskSh(obj).then(res => {
+          this.ruleForm = res.data;
+          if (!this.ruleForm.ptlx) {
+            this.ruleForm.ptlx = '1'
+          }
+          setTimeout(() => {
+            this.$refs.ruleForm.clearValidate()
+
+          }, 100);
+        })
+      }
 
-        }, 100);
-      })
     },
     // 单位名称模糊查询
     querySearchAsync(queryString, cb) {
@@ -552,27 +611,37 @@ export default {
       this.ruleForm.assetId = this.$route.query.assetId
       if (type == 0) {
 
-        this.$refs.butongguo.open()
+        this.$refs['ruleForm'].validate((valid) => {
+
+this.$refs.butongguo.open()
+
+})
 
       }
       if (type == 1) {
-        let tijioaobj = {
+        this.$refs['ruleForm'].validate((valid) => {
-          taskId: this.$route.query.taskId,
+
-          assetId: this.$route.query.assetId,
+          let tijioaobj = {
-          xtmc: this.ruleForm.gzhmc,
+            taskId: this.$route.query.taskId,
-          status: 3,
+            assetId: this.$route.query.assetId,
-          type: this.$route.query.type
+            xtmc: this.ruleForm.gzhmc,
-        }
+            status: 3,
-        assetTasksh(tijioaobj).then(res => {
+            type: this.$route.query.type,
-          if (res.code == 200) {
+            assetOfficialAccountCpPo: this.ruleForm
-            this.$modal.msgSuccess("审核成功");
+
-            this.$router.go(-1);
           }
+          assetTasksh(tijioaobj).then(res => {
+            if (res.code == 200) {
+              this.$modal.msgSuccess("审核成功");
+              this.$router.go(-1);
+            }
+          })
         })
+
       }
 
     },
-  
+
   },
 }
 </script>

src/views/components/renwuType/index_v3.vue

@@ -18,7 +18,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="电子邮箱后缀" prop="dzyxhz">
-                <el-input v-model="ruleForm.dzyxhz" placeholder="请输入电子邮箱后缀" disabled></el-input>
+                <el-input v-model="ruleForm.dzyxhz" placeholder="请输入电子邮箱后缀"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -158,27 +158,27 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="ruleForm.bfyy">
+          <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
-            <el-col :span="24">
+              <span class="top-title-box">关停原因</span>
-              <el-form-item label="关停原因">
+            </el-row>
-                                <div>{{ ruleForm.bfyy }}</div>
+            <el-row style="margin: 20px 0;">
-                              </el-form-item>
+              <el-form-item>
-            </el-col>
+                <div>{{ ruleForm.bfyy }}</div>
-          </el-row>
+              </el-form-item>
-         
+            </el-row>
+
 
         </el-form>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
-            v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
+          v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
-            <el-button type="danger" @click="newAssets(0)">关停</el-button>
+          <el-button type="danger" @click="newAssets(0)">关停</el-button>
-            <el-button @click="newAssets(1)">取消</el-button>
+          <el-button @click="newAssets(1)">取消</el-button>
-            <el-button type="warning" @click="newAssets(2)">暂存</el-button>
+          <el-button type="warning" @click="newAssets(2)">暂存</el-button>
-            <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
+          <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
           <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
-          </el-row>
+        </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
-          v-if="pageType == 'look'">
           <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
         </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
@@ -187,21 +187,23 @@
           <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
           <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
         </el-row>
-      
+
       </div>
     </div>
     <baofei ref='baofei' :ruleForm='ruleForm' @assetTaskzc="guanting"></baofei>
-    <butongguo ref='butongguo' :chuandemingcheng='ruleForm.gzhmc'></butongguo>
+    <butongguo ref='butongguo' :chuandemingcheng='ruleForm.gzhmc' :ruleForm="this.ruleForm" dataname="assetEmailCpPo"></butongguo>
   </div>
 </template>
 <script>
 import { assetEmail, assetEmailInfo, unitAllList } from "@/api/auditPagesApi/index";
-import { assetTaskemailtaskSh, assetTaskemailzc, assetTasksh, assetTaskemailjyTj } from "@/api/renwuApi/index.js"
+import { assetTaskemailtaskSh, assetTaskemailzc, assetTasksh, assetTaskemailjyTj ,assetTaskhistory} from "@/api/renwuApi/index.js"
 import baofei from "@/views/components/renwuType/baofei.vue"
 import butongguo from "@/views/components/renwuType/butongguo.vue"
+import myMixin from '@/views/components/renwuType/minxfanhui.js';
 
 export default {
   components: { baofei, butongguo },
+  mixins: [myMixin],
 
   dicts: ['app_xzqh', 'app_sshy', 'app_zdhy', 'email_jslx', 'email_state', 'email_hasorno'],
   data() {
@@ -284,31 +286,41 @@ export default {
       this.getInfo(this.id)
       this.disabled = false;
     }
-    if (this.$route.query.taskInfo == 'taskInfo') {
+    // if (this.$route.query.taskInfo == 'taskInfo') {
-      this.disabled = true;
+    //   this.disabled = true;
-    }
+    // }
   },
   methods: {
-    sendBack() {
+   
-      if (localStorage.getItem('ismypaginationTow')) {
-        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
-        formInline.isfanhuiTow = true
-        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
-      }
-      this.$router.go(-1);
-    },
     getInfo(id) {
-      let obj = {
+      if (this.$route.query.istijiaoshow) {
-        taskId: this.$route.query.taskId,
+
-        assetId: this.$route.query.assetId
+        let obj = {
+          id: this.$route.query.assetId,
+          type: this.$route.query.type
+        }
+        assetTaskhistory(obj).then(res => {
+          this.ruleForm = res.data.assetEmailHistory;
+
+          console.log(111);
+          setTimeout(() => {
+            this.$refs.ruleForm.clearValidate()
+          }, 100);
+        })
+      } else {
+        let obj = {
+          taskId: this.$route.query.taskId,
+          assetId: this.$route.query.assetId
+        }
+        assetTaskemailtaskSh(obj).then(res => {
+          this.ruleForm = res.data;
+          setTimeout(() => {
+            this.$refs.ruleForm.clearValidate()
+
+          }, 100);
+        })
       }
-      assetTaskemailtaskSh(obj).then(res => {
-        this.ruleForm = res.data;
-        setTimeout(() => {
-          this.$refs.ruleForm.clearValidate()
 
-        }, 100);
-      })
     },
     // 单位名称模糊查询
     querySearchAsync(queryString, cb) {
@@ -383,27 +395,38 @@ export default {
       this.ruleForm.assetId = this.$route.query.assetId
       if (type == 0) {
 
-        this.$refs.butongguo.open()
+        this.$refs['ruleForm'].validate((valid) => {
+
+this.$refs.butongguo.open()
+
+})
 
       }
       if (type == 1) {
-        let tijioaobj = {
+
-          taskId: this.$route.query.taskId,
+        this.$refs['ruleForm'].validate((valid) => {
-          assetId: this.$route.query.assetId,
+
-          xtmc: this.ruleForm.dzyxhz,
+          let tijioaobj = {
-          status: 3,
+            taskId: this.$route.query.taskId,
-          type: this.$route.query.type
+            assetId: this.$route.query.assetId,
-        }
+            xtmc: this.ruleForm.dzyxhz,
-        assetTasksh(tijioaobj).then(res => {
+            status: 3,
-          if (res.code == 200) {
+            type: this.$route.query.type,
-            this.$modal.msgSuccess("审核成功");
+            assetEmailCpPo: this.ruleForm
-            this.$router.go(-1);
+
           }
+          assetTasksh(tijioaobj).then(res => {
+            if (res.code == 200) {
+              this.$modal.msgSuccess("审核成功");
+              this.$router.go(-1);
+            }
+          })
         })
+
       }
 
     },
-    
+
   },
 }
 </script>

src/views/components/renwuType/index_v4.vue

@@ -18,7 +18,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="移动应用名称" prop="appName">
-                <el-input v-model="ruleForm.appName" placeholder="请输入移动应用名称" disabled></el-input>
+                <el-input v-model="ruleForm.appName" placeholder="请输入移动应用名称"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -145,27 +145,27 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="ruleForm.bfyy">
+          <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
-            <el-col :span="24">
+              <span class="top-title-box">关停原因</span>
-              <el-form-item label="关停原因">
+            </el-row>
-                                <div>{{ ruleForm.bfyy }}</div>
+            <el-row style="margin: 20px 0;">
-                              </el-form-item>
+              <el-form-item>
-            </el-col>
+                <div>{{ ruleForm.bfyy }}</div>
-          </el-row>
+              </el-form-item>
-         
+            </el-row>
+
 
         </el-form>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
-            v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
+          v-if="pageType !== 'look' && $route.name == 'mytaskAuditInfo'">
-            <el-button type="danger" @click="newAssets(0)">关停</el-button>
+          <el-button type="danger" @click="newAssets(0)">关停</el-button>
-            <el-button @click="newAssets(1)">取消</el-button>
+          <el-button @click="newAssets(1)">取消</el-button>
-            <el-button type="warning" @click="newAssets(2)">暂存</el-button>
+          <el-button type="warning" @click="newAssets(2)">暂存</el-button>
-            <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
+          <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
           <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
-          </el-row>
+        </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="pageType == 'look'">
-          v-if="pageType == 'look'">
           <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
         </el-row>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
@@ -175,20 +175,23 @@
           <!-- <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button> -->
 
         </el-row>
-      
+
       </div>
     </div>
     <baofei ref='baofei' :ruleForm='ruleForm' @assetTaskzc="guanting"></baofei>
-    <butongguo ref='butongguo' :chuandemingcheng='ruleForm.appName'></butongguo>
+    <butongguo ref='butongguo' :chuandemingcheng='ruleForm.appName' :ruleForm="this.ruleForm" dataname="assetAppCpPo"></butongguo>
   </div>
 </template>
 <script>
 import { assetApp, assetAppInfo, unitAllList } from "@/api/auditPagesApi/index";
-import { assetTaskapptaskSh, assetTaskappzc, assetTasksh, assetTaskappjyTj } from "@/api/renwuApi/index.js"
+import { assetTaskapptaskSh, assetTaskappzc, assetTasksh, assetTaskappjyTj,assetTaskhistory } from "@/api/renwuApi/index.js"
 import baofei from "@/views/components/renwuType/baofei.vue"
 import butongguo from "@/views/components/renwuType/butongguo.vue"
+import myMixin from '@/views/components/renwuType/minxfanhui.js';
+
 export default {
   components: { baofei, butongguo },
+  mixins: [myMixin],
 
   dicts: ['app_icp_state', 'app_sshy', 'app_zdhy', 'app_xzqh', 'app_aqjgqk', 'gzh_state'],
   data() {
@@ -274,31 +277,41 @@ export default {
       this.getInfo(this.id)
       this.disabled = false;
     }
-    if (this.$route.query.taskInfo == 'taskInfo') {
+    // if (this.$route.query.taskInfo == 'taskInfo') {
-      this.disabled = true;
+    //   this.disabled = true;
-    }
+    // }
   },
   methods: {
-    sendBack() {
+  
-      if (localStorage.getItem('ismypaginationTow')) {
-        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
-        formInline.isfanhuiTow = true
-        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
-      }
-      this.$router.go(-1);
-    },
     getInfo(id) {
-      let obj = {
+      if (this.$route.query.istijiaoshow) {
-        taskId: this.$route.query.taskId,
+
-        assetId: this.$route.query.assetId
+        let obj = {
+          id: this.$route.query.assetId,
+          type: this.$route.query.type
+        }
+        assetTaskhistory(obj).then(res => {
+          this.ruleForm = res.data.assetAppHistory;
+
+          console.log(111);
+          setTimeout(() => {
+            this.$refs.ruleForm.clearValidate()
+          }, 100);
+        })
+      } else {
+        let obj = {
+          taskId: this.$route.query.taskId,
+          assetId: this.$route.query.assetId
+        }
+        assetTaskapptaskSh(obj).then(res => {
+          this.ruleForm = res.data;
+          setTimeout(() => {
+            this.$refs.ruleForm.clearValidate()
+
+          }, 100);
+        })
       }
-      assetTaskapptaskSh(obj).then(res => {
-        this.ruleForm = res.data;
-        setTimeout(() => {
-          this.$refs.ruleForm.clearValidate()
 
-        }, 100);
-      })
     },
     // 单位名称模糊查询
     querySearchAsync(queryString, cb) {
@@ -373,27 +386,37 @@ export default {
       this.ruleForm.assetId = this.$route.query.assetId
       if (type == 0) {
 
-        this.$refs.butongguo.open()
+        this.$refs['ruleForm'].validate((valid) => {
+
+this.$refs.butongguo.open()
+
+})
 
       }
       if (type == 1) {
-        let tijioaobj = {
+        this.$refs['ruleForm'].validate((valid) => {
-          taskId: this.$route.query.taskId,
+
-          assetId: this.$route.query.assetId,
+          let tijioaobj = {
-          xtmc: this.ruleForm.appName,
+            taskId: this.$route.query.taskId,
-          status: 3,
+            assetId: this.$route.query.assetId,
-          type: this.$route.query.type
+            xtmc: this.ruleForm.appName,
-        }
+            status: 3,
-        assetTasksh(tijioaobj).then(res => {
+            type: this.$route.query.type,
-          if (res.code == 200) {
+            assetAppCpPo: this.ruleForm
-            this.$modal.msgSuccess("审核成功");
+
-            this.$router.go(-1);
           }
+          assetTasksh(tijioaobj).then(res => {
+            if (res.code == 200) {
+              this.$modal.msgSuccess("审核成功");
+              this.$router.go(-1);
+            }
+          })
         })
+
       }
 
     },
-   
+
   },
 }
 </script>

src/views/components/renwuType/minxfanhui.js

@@ -0,0 +1,35 @@
+// src/mixins/myMixin.js
+export default {
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+    sendBack() {
+      if (localStorage.getItem('ismypaginationTow')) {
+        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+        formInline.isfanhuiTow = true
+        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
+      }
+      console.log();
+
+      if (this.$route.query.istijiaoshow) {
+        this.$router.push({
+          name: 'TaskInfo', query: {
+            // pageType: "look",
+            id: this.$route.query.taskId,
+            assetId: this.$route.query.lookassetId,
+            lookassetId: this.$route.query.lookassetId,
+            pageType: this.$route.query.pageTypetow,
+            istijiaoshow: true
+          }
+        })
+      } else {
+        this.$router.go(-1);
+
+      }
+    },
+  }
+};

src/views/components/renwuType/webType2DW.vue

@@ -13,15 +13,15 @@
             <el-col :span="12">
               <el-form-item label="系统名称" required :rules="{
                 required: true, message: '请输入', trigger: 'blur'
-              }" prop="xtmc">
+              }" prop="xtmc" >
-                <el-input v-model="ruleForm.xtmc" disabled></el-input>
+                <el-input v-model="ruleForm.xtmc" :disabled='true'></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="单位名称" required :rules="{
                 required: true, message: '请输入', trigger: 'blur'
-              }" prop="dwmc" disabled>
+              }" prop="dwmc" >
-                <el-input v-model="ruleForm.dwmc" disabled></el-input>
+                <el-input v-model="ruleForm.dwmc" :disabled='true'></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -2642,11 +2642,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
-                <el-form-item label="是否涉密数据" required :prop="`sjzcSmsj`" :rules="{
+                <el-form-item label="数据量单位" required :prop="`sjzcSjldw`" :rules="{
                   required: true, message: '请输入', trigger: 'blur'
                 }">
-                  <el-select v-model="ruleForm.sjzcSmsj" placeholder="请选择是否涉密数据">
+                  <el-select v-model="ruleForm.sjzcSjldw" placeholder="请选择数据量单位">
-                    <el-option v-for="dict in dict.type.is_no" :key="dict.value" :label="dict.label"
+                    <el-option v-for="dict in dict.type.sjzc_sjldw" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
                   </el-select>
                 </el-form-item>
@@ -2665,7 +2665,7 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据分级分类" required :prop="`sjzcSjfjfl`" :rules="{
-                  required: true, message: '请输入', trigger: 'blur'
+                  required: true, message: '请输入', trigger: 'change'
                 }">
                   <el-select v-model="ruleForm.sjzcSjfjfl" placeholder="请选择数据分级分类">
                     <el-option v-for="dict in dict.type.sjzc_sjfjfl" :key="dict.value" :label="dict.label"
@@ -2685,6 +2685,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="12" style="margin-left: 10px;">
+                <el-form-item label="是否涉密数据" required :prop="`sjzcSmsj`" :rules="{
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
+                  <el-select v-model="ruleForm.sjzcSmsj" placeholder="请选择是否涉密数据">
+                    <el-option v-for="dict in dict.type.is_no" :key="dict.value" :label="dict.label"
+                      :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row style="display: flex;">
               <el-col :span="24">
@@ -2777,8 +2787,10 @@ import myUpload from "@/views/components/myUpload/index.vue";
 import { assetUnitData, assetInfo } from "@/api/auditPagesApi/index";
 import { assetTasktaskSh, geassetTaskcHc, assetTasksh } from "@/api/renwuApi/index.js"
 import { assetTaskzc, assetTaskjyTj } from "@/api/renwuApi/index.js"
+import myMixin from '@/views/components/renwuType/minxfanhui.js';
 
 export default {
+  mixins: [myMixin],
 
   name: "AssetsAuth",
   dicts: [
@@ -2786,7 +2798,7 @@ export default {
     'zc_yhgm', 'zc_xtbsfs', 'zc_hlwkfyt', 'fgfw', 'wlxz', 'ywlx', 'hlqk', 'fwdx',
     'fwfw', 'dbxx_dbdj', 'dbxx_zjps', 'sf_cpszsdj', 'sjzc_gxsx', 'sjzc_kfsx', 'sjzc_sjly',
     'sjzc_gxzq', 'sjzc_sjfjfl', 'fwq_czxt', 'wlw_fwdx', 'wlw_wlhlqk', 'wlw_fwfw', 'dwlx', 'sb_ip',
-    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type'
+    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type',"sjzc_sjldw"
   ],
   components: {
     myUpload, myDialog
@@ -2801,8 +2813,15 @@ export default {
         //任意值被填写，清除验证提示
         if (!this.ruleForm.ywxttpwj || !this.ruleForm.ywxttpt) {
           this.$nextTick(() => {
-            this.$refs.ruleForm.clearValidate("ywxttpwj")
+            if(this.$refs.ruleForm.clearValidate("ywxttpwj")){
-            this.$refs.ruleForm.clearValidate("ywxttpt")
+              this.$refs.ruleForm.clearValidate("ywxttpwj")
+
+            }
+            if(this.$refs.ruleForm.clearValidate("ywxttpt")){
+              this.$refs.ruleForm.clearValidate("ywxttpt")
+
+            }
+            
           })
         }
         callback()
@@ -3035,14 +3054,7 @@ export default {
     }
   },
   methods: {
-    sendBack() {
+  
-      if (localStorage.getItem('ismypaginationTow')) {
-        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
-        formInline.isfanhuiTow = true
-        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
-      }
-      this.$router.go(-1);
-    },
     importClose() { },
     // 关闭新增弹窗
     resetForm() {
@@ -3090,6 +3102,12 @@ export default {
           this.select = arr[0]
           this.ruleForm.fwwz = arr[1]
         }
+        if (this.ruleForm.glymList.length == 0) {
+          this.ruleForm.glymList.push({ key: "" })
+        }
+        if (this.ruleForm.glIpList.length == 0) {
+          this.ruleForm.glIpList.push({ key: "" })
+        }
         this.ruleForm.xttz ? this.xttz = this.ruleForm.xttz.split(',') : [];
 
         let chepingUnit = this.ruleForm.gylxxList.filter((item) => item.type == 1)

src/views/system/user/danweiList.vue

@@ -153,6 +153,7 @@ export default {
         userName: undefined,
         nickName: undefined,
         dwlx: undefined,
+        type:"0",
       },
       // 表单校验
 
@@ -169,7 +170,7 @@ export default {
     }
   },
   created() {
-    this.getList();
+    // this.getType();
     // this.getConfigKey("sys.user.initPassword").then(response => {
     //   this.initPassword = response.msg;
     // });
@@ -237,6 +238,7 @@ export default {
     },
     getType(type){
       this.queryParams.type = type.join(",")
+      this.getList()
     },
     /** 查询用户列表 */
     getList(type) {

src/views/system/user/index.vue

@@ -458,8 +458,12 @@ export default {
     // });
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.queryParams = this.$route.params;
+    }else{
+      this.queryParams = this.$route.params;
+      this.queryParams.current = 1
+      this.queryParams.size = 20
     }
     this.getList();
     this.getDeptTree();

src/views/unitPages/myAssets/email.vue

@@ -124,8 +124,11 @@ export default {
     }
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.cancalDebounce();

src/views/unitPages/myAssets/index.vue

@@ -142,8 +142,11 @@ export default {
     }
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.cancalDebounce();

src/views/unitPages/myAssets/mobileApplication.vue

@@ -152,8 +152,11 @@ export default {
     }
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.cancalDebounce();

src/views/unitPages/myAssets/officialAccount.vue

@@ -158,8 +158,11 @@ export default {
     }
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.cancalDebounce();

src/views/unitPages/myAssets/program.vue

@@ -157,8 +157,11 @@ export default {
     }
   },
   mounted(){
-    if(this.$route.params) {
+    if( Object.keys(this.$route.params).length != 0) {
       this.formInline = this.$route.params;
+    }else{
+      this.formInline.current = 1
+      this.formInline.size = 20
     }
     this.getList();
     this.cancalDebounce();

src/views/unitPages/myTask/audit copy.vue

@@ -2614,11 +2614,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
-                <el-form-item label="是否涉密数据" required :prop="`sjzcSmsj`" :rules="{
+                <el-form-item label="数据量单位" required :prop="`sjzcSjldw`" :rules="{
                     required: true, message: '请输入', trigger: 'blur'
                   }">
-                  <el-select v-model="ruleForm.sjzcSmsj" placeholder="请选择是否涉密数据">
+                  <el-select v-model="ruleForm.sjzcSjldw" placeholder="请选择数据量单位">
-                    <el-option v-for="dict in dict.type.is_no" :key="dict.value" :label="dict.label"
+                    <el-option v-for="dict in dict.type.sjzc_sjldw" :key="dict.value" :label="dict.label"
                       :value="dict.value" />
                   </el-select>
                 </el-form-item>
@@ -2637,7 +2637,7 @@
               </el-col>
               <el-col :span="12" style="margin-left: 10px;">
                 <el-form-item label="数据分级分类" required :prop="`sjzcSjfjfl`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
+                    required: true, message: '请输入', trigger: 'change'
                   }">
                   <el-select v-model="ruleForm.sjzcSjfjfl" placeholder="请选择数据分级分类">
                     <el-option v-for="dict in dict.type.sjzc_sjfjfl" :key="dict.value" :label="dict.label"
@@ -2657,6 +2657,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="12" style="margin-left: 10px;">
+                <el-form-item label="是否涉密数据" required :prop="`sjzcSmsj`" :rules="{
+                  required: true, message: '请输入', trigger: 'blur'
+                }">
+                  <el-select v-model="ruleForm.sjzcSmsj" placeholder="请选择是否涉密数据">
+                    <el-option v-for="dict in dict.type.is_no" :key="dict.value" :label="dict.label"
+                      :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row style="display: flex;">
               <el-col :span="24">
@@ -2744,7 +2754,7 @@ export default {
     'zc_yhgm', 'zc_xtbsfs', 'zc_hlwkfyt', 'fgfw', 'wlxz', 'ywlx', 'hlqk', 'fwdx',
     'fwfw', 'dbxx_dbdj', 'dbxx_zjps', 'sf_cpszsdj', 'sjzc_gxsx', 'sjzc_kfsx', 'sjzc_sjly',
     'sjzc_gxzq', 'sjzc_sjfjfl', 'fwq_czxt', 'wlw_fwdx', 'wlw_wlhlqk', 'wlw_fwfw', 'dwlx', 'sb_ip',
-    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type'
+    'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls', 'database_type',"sjzc_sjldw"
   ],
   components: {
     myUpload,myDialog

src/views/unitPages/myTask/info.vue

@@ -1,11 +1,16 @@
 <template>
-
   <!-- 任务核查 -->
   <div class="L-task-info">
     <div class="info-left info-left-two" id="L-size-main">
       <div class="content-info content-info-two" id="L-header">
         <div class="info-title">任务详情</div>
-        <el-button type="primary" @click="sendBack" class="fanhuipiaofu" size='mini'>返回</el-button>
+        <el-button
+          type="primary"
+          @click="sendBack"
+          class="fanhuipiaofu"
+          size="mini"
+          >返回</el-button
+        >
 
         <div class="teshu-top-info">
           <div class="top-info">
@@ -36,7 +41,13 @@
           <div class="info-title">资产信息</div>
         </div>
         <div class="info-bottom-box">
-          <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" v-if="index == 1">
+          <el-form
+            :inline="true"
+            :model="formInline"
+            size="small"
+            class="demo-form-inline"
+            v-if="index == 1"
+          >
             <el-row>
               <!-- <el-col :span="7">
                 <el-form-item label="核查单位:">
@@ -52,35 +63,49 @@
                   </el-select>
                 </el-form-item>
               </el-col> -->
+              <el-col :span="7">
+                <el-form-item label="系统名称:">
+                  <el-input
+                    v-model="formInline.xtmc"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="7">
                 <el-form-item label="审核状态:">
                   <el-select v-model="formInline.status" placeholder="请选择">
-                    <el-option label="未核查" value="0">
+                    <el-option label="未核查" value="0"> </el-option>
-                    </el-option>
+                    <el-option label="已核查" value="1"> </el-option>
-                    <el-option label="已核查" value="1">
+                    <el-option label="审核通过" value="3"> </el-option>
-                    </el-option>
+                    <el-option label="审核不通过" value="4"> </el-option>
-                    <el-option label="审核通过" value="3">
+                    <el-option label="已关停" value="5"> </el-option>
-                    </el-option>
-                    <el-option label="审核不通过" value="4">
-                    </el-option>
-                    <el-option label="已关停" value="5">
-                    </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="4">
                 <el-form-item>
-                  <el-button size="mini" type="primary" @click="handleQuery()">查询</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery()"
+                    >查询</el-button
+                  >
                   <el-button size="mini" @click="resetQuery()">重置</el-button>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
-          <el-form :inline="true" :model="formInlineTwo" size="small" class="demo-form-inline" v-if="index == 2">
+          <el-form
+            :inline="true"
+            :model="formInlineTwo"
+            size="small"
+            class="demo-form-inline"
+            v-if="index == 2"
+          >
             <el-row>
               <el-col :span="7">
                 <el-form-item label="单位名称：">
-                  <el-input v-model="formInlineTwo.unitName" placeholder="请输入"></el-input>
+                  <el-input
+                    v-model="formInlineTwo.unitName"
+                    placeholder="请输入"
+                  ></el-input>
                   <!-- <el-select v-model="formInline.unit" placeholder="请选择"> -->
                   <!-- <el-option
                           v-for="dict in dict.type.bms_approval_status"
@@ -93,7 +118,9 @@
               </el-col>
               <el-col :span="4">
                 <el-form-item>
-                  <el-button size="mini" type="primary" @click="handleQuery()">查询</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery()"
+                    >查询</el-button
+                  >
                   <el-button size="mini" @click="resetQuery()">重置</el-button>
                 </el-form-item>
               </el-col>
@@ -101,115 +128,212 @@
           </el-form>
           <section v-if="index == 1">
             <el-tabs v-model="activeName" @tab-click="handleClick">
-              <el-tab-pane :label="item.conent" :name="item.lable" :xtmcName="item.xtmcName"
+              <el-tab-pane
-                v-for="item in chanckListTow"></el-tab-pane>
+                :label="item.conent"
-
+                :name="item.lable"
+                :xtmcName="item.xtmcName"
+                v-for="item in chanckListTow"
+              ></el-tab-pane>
             </el-tabs>
-            <el-table v-loading="loading" :data="tableData" :height="tabHeader" :max-height="tabHeader"
+            <el-table
-              :row-class-name="tableRowClassName">
+              v-loading="loading"
-              <el-table-column type="index" width="50" label="序号" align="center" />
+              :data="tableData"
+              :height="tabHeader"
+              :max-height="tabHeader"
+              :row-class-name="tableRowClassName"
+            >
+              <el-table-column
+                type="index"
+                width="50"
+                label="序号"
+                align="center"
+              />
               <!-- <el-table-column label="资产编号" key="id" width="200px" prop="id" align="center" /> -->
-              <el-table-column :label="xtmcName" key="xtmc" prop="xtmc" align="center" />
+              <el-table-column :label="xtmcName" prop="xtmc" align="center" />
               <!-- <el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx" />
                 </template>
 </el-table-column> -->
-              <el-table-column label="核查单位" key="zcdwmc" prop="zcdwmc" align="center" />
+              <el-table-column label="核查单位" prop="zcdwmc" align="center" />
-              <el-table-column label="审核状态" key="status" width="200px" prop="status" class-name="table-status"
+              <el-table-column
-                align="center">
+                label="单位核查时间"
+                prop="updateTime"
+                align="center"
+              />
+              <el-table-column
+                label="审核状态"
+                width="200px"
+                prop="status"
+                class-name="table-status"
+                align="center"
+              >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.status == 0" style="color: #E6A23C;">
+                  <span v-if="scope.row.status == 0" style="color: #e6a23c">
                     未核查
                   </span>
-                  <span v-if="scope.row.status == 1" style="color: #67C23A;">
+                  <span v-if="scope.row.status == 1" style="color: #67c23a">
                     已核查
                   </span>
-                  <span v-if="scope.row.status == 3" style="color: #67C23A;">
+                  <span v-if="scope.row.status == 3" style="color: #67c23a">
                     审核通过
                   </span>
-                  <span v-if="scope.row.status == 4" style="color: #F56C6C;">
+                  <span v-if="scope.row.status == 4" style="color: #f56c6c">
                     审核不通过
                   </span>
-                  <span v-if="scope.row.status == 5" style="color: #F56C6C;">
+                  <span v-if="scope.row.status == 5" style="color: #f56c6c">
                     已关停
                   </span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
+              <el-table-column
+                label="操作"
+                prop="userId"
+                class-name="table-operation"
+                align="center"
+              >
                 <template slot-scope="scope">
-                  <div style="display: flex;align-items: center;justify-content: center;">
+                  <div
-                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1, scope.row)"
+                    style="
-                      v-if="(scope.row.status != 4 && scope.row.status != 0) || ($route.query.pageType == 'look' || $route.meta.pageType == 'look')">
+                      display: flex;
-                      <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                      align-items: center;
-                      <span class="look-info" style="color: #1485EF;">查看</span>
+                      justify-content: center;
+                    "
+                  >
+                    <div
+                      style="
+                        display: flex;
+                        align-items: center;
+                        cursor: pointer;
+                      "
+                      @click="goInfo(1, scope.row)"
+                      v-if="
+                        (scope.row.status != 4 && scope.row.status != 0) ||
+                        $route.query.pageType == 'look' ||
+                        $route.meta.pageType == 'look'
+                      "
+                    >
+                      <img
+                        src="@/assets/images/icon-ck@2x.png"
+                        alt=""
+                        style="width: 20px; margin-right: 5px"
+                      />
+                      <span class="look-info" style="color: #1485ef">查看</span>
                     </div>
                     <!-- v-if="scope.row.taskStatus == 1" -->
                     <div
-                      v-if="($route.query.pageType == 'info' || $route.meta.pageType == 'info') && scope.row.status != 3 && scope.row.status != 5 && scope.row.status != 1"
+                      v-if="
-                      style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
+                        ($route.query.pageType == 'info' ||
-                      @click="goInfo(2, scope.row)">
+                          $route.meta.pageType == 'info') &&
-                      <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
+                        scope.row.status != 3 &&
-                      <span class="del-info" style="color: #1485EF;">核查</span>
+                        scope.row.status != 5 &&
+                        scope.row.status != 1
+                      "
+                      style="
+                        display: flex;
+                        align-items: center;
+                        cursor: pointer;
+                        margin-left: 10px;
+                      "
+                      @click="goInfo(2, scope.row)"
+                    >
+                      <img
+                        src="@/assets/images/icon-shenhe@2x.png"
+                        alt=""
+                        style="width: 15px; margin-right: 5px"
+                      />
+                      <span class="del-info" style="color: #1485ef">核查</span>
                     </div>
-                    <div style="display: flex;align-items: center;cursor: pointer;margin-left: 5px;"
+                    <!-- scope.row.status == 4  -->
-                      @click="goInfo(3, scope.row)" v-show='scope.row.status == 4'>
+                    <div
-                      <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                      style="
-                      <span class="look-info" style="color: #1485EF;">查看原因</span>
+                        display: flex;
+                        align-items: center;
+                        cursor: pointer;
+                        margin-left: 5px;
+                      "
+                      @click="goInfo(3, scope.row)"
+                      v-show="scope.row.btgyy"
+                    >
+                      <img
+                        src="@/assets/images/icon-ck@2x.png"
+                        alt=""
+                        style="width: 20px; margin-right: 5px"
+                      />
+                      <span class="look-info" style="color: #1485ef"
+                        >查看原因</span
+                      >
                     </div>
                   </div>
                 </template>
               </el-table-column>
             </el-table>
           </section>
-          <my-pagination id="L-pagination" :total="total" :page="pagination.current" :limit="pagination.size"
+          <my-pagination
-            @pagination="getPagination" :current-page.sync="pagination.current"></my-pagination>
+            id="L-pagination"
+            :total="total"
+            :page="pagination.current"
+            :limit="pagination.size"
+            @pagination="getPagination"
+            :current-page.sync="pagination.current"
+          ></my-pagination>
         </div>
       </main>
     </div>
-    <div class="info-right" v-if="$route.query.pageType == 'look' || $route.meta.pageType == 'look'">
+    <div
+      class="info-right"
+      v-if="$route.query.pageType == 'look' || $route.meta.pageType == 'look'"
+    >
       <div class="info-title">任务流程节点</div>
       <div class="timeline">
         <div class="timeline-items" v-for="(item, index) in timeLineData">
           <div class="left-box">
-            <img class="main-img" :src="returnidimg(item.assetName)" alt="">
+            <img class="main-img" :src="returnidimg(item.assetName)" alt="" />
             <!-- <img class="main-img" v-if="item.status == 2" src="" alt="">
             <img class="main-img" v-if="item.status == 3" src="" alt="">
             <img class="main-img" v-if="item.status == 4" src="" alt=""> -->
-            <img class="icon-jt" v-if="(index + 1) != timeLineData.length" src="@/assets/images/icon-jt@2x.png" alt="">
+            <img
+              class="icon-jt"
+              v-if="index + 1 != timeLineData.length"
+              src="@/assets/images/icon-jt@2x.png"
+              alt=""
+            />
           </div>
           <div class="right-box">
-
             <span class="span-title">{{ item.assetName }}:</span>
             <span class="span-time">{{ item.xfTime }}</span>
           </div>
         </div>
       </div>
     </div>
-    <my-dialog title="查看原因" ref="liebiaoDialog" @close="importClose" class="taskDialogBox" width="40%">
+    <my-dialog
+      title="查看原因"
+      ref="liebiaoDialog"
+      @close="importClose"
+      class="taskDialogBox"
+      width="40%"
+    >
       <el-descriptions>
         <el-descriptions-item label="不通过原因">
           {{ chakanyuanyin }}
-
         </el-descriptions-item>
       </el-descriptions>
     </my-dialog>
   </div>
 </template>
 <script>
-import myPagination from "@/views/components/Pagination/index.vue"
+import myPagination from "@/views/components/Pagination/index.vue";
-import { getassetTaskid, geassetTaskcHc } from "@/api/renwuApi/index.js"
+import { getassetTaskid, geassetTaskcHc } from "@/api/renwuApi/index.js";
-import { assetLcpage } from "@/api/renwuApi/index.js"
+import { assetLcpage } from "@/api/renwuApi/index.js";
-import myDialog from "@/views/components/myDialog/index.vue"
+import myDialog from "@/views/components/myDialog/index.vue";
 
 export default {
-  dicts: ['zc_xtlx'],
+  dicts: ["zc_xtlx"],
   components: { myPagination, myDialog },
   data() {
     return {
       index: 1,
-      formInline: {
+      formInline: {},
-      },
       formInlineTwo: {
         unitName: "",
       },
@@ -218,12 +342,8 @@ export default {
         current: 1,
         size: 10,
       },
-      tableData: [
+      tableData: [],
-
+      tableDataTwo: [],
-      ],
-      tableDataTwo: [
-
-      ],
       loading: false,
       tabHeader: undefined,
       timeLineData: [],
@@ -260,41 +380,37 @@ export default {
       ],
       chanckListTow: [],
       listTow: [],
-    }
+    };
   },
   mounted() {
-
     this.cancalDebounce();
-    window.addEventListener('resize', this.cancalDebounce);
+    window.addEventListener("resize", this.cancalDebounce);
-    this.titleInfo()
+    this.titleInfo();
-    this.assetLcpageList()
+    this.assetLcpageList();
 
-    if (localStorage.getItem('ismypaginationTow')) {
+    if (localStorage.getItem("ismypaginationTow")) {
-      console.log(JSON.parse(localStorage.getItem('ismypaginationTow')));
+      console.log(JSON.parse(localStorage.getItem("ismypaginationTow")));
-      
-      if (JSON.parse(localStorage.getItem('ismypaginationTow')).isfanhuiTow) {
 
-        this.formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+      if (JSON.parse(localStorage.getItem("ismypaginationTow")).isfanhuiTow) {
+        this.formInline = JSON.parse(localStorage.getItem("ismypaginationTow"));
         console.log(99999, this.formInline);
-        this.titleInfo()
+        this.titleInfo();
       } else {
         console.log(99999, this.formInline);
-        localStorage.removeItem("ismypaginationTow")
+        localStorage.removeItem("ismypaginationTow");
       }
     }
-
-
   },
   destroyed() {
-    window.removeEventListener('resize', this.cancalDebounce);
+    window.removeEventListener("resize", this.cancalDebounce);
   },
 
   methods: {
     sendBack() {
-      if (localStorage.getItem('ismypagination')) {
+      if (localStorage.getItem("ismypagination")) {
-        let formInline = JSON.parse(localStorage.getItem('ismypagination'))
+        let formInline = JSON.parse(localStorage.getItem("ismypagination"));
-        formInline.isfanhui = true
+        formInline.isfanhui = true;
-        localStorage.setItem("ismypagination", JSON.stringify(formInline))
+        localStorage.setItem("ismypagination", JSON.stringify(formInline));
       }
       this.$router.go(-1);
     },
@@ -303,13 +419,12 @@ export default {
       // this.formInline = {
       // }
 
-      this.activeName = tab.name
+      this.activeName = tab.name;
 
-      this.xtmcName = tab.$attrs.xtmcName
+      this.xtmcName = tab.$attrs.xtmcName;
-
-      localStorage.setItem("activeName", this.activeName)
-      this.handleQuery()
 
+      localStorage.setItem("activeName", this.activeName);
+      this.handleQuery();
     },
     //返回图片
     returnidimg(iswenzi) {
@@ -323,149 +438,151 @@ export default {
       let listsna = [
         {
           name: "下发",
-          imgdata: require('@/assets/images/rwxf.png'),
+          imgdata: require("@/assets/images/rwxf.png"),
-        }, {
+        },
+        {
           name: "提交",
-          imgdata: require('@/assets/images/wctj.png'),
+          imgdata: require("@/assets/images/wctj.png"),
-        }, {
+        },
+        {
           name: "不通过",
-          imgdata: require('@/assets/images/shbh.png'),
+          imgdata: require("@/assets/images/shbh.png"),
-        }, {
+        },
+        {
           name: "审核通过",
-          imgdata: require('@/assets/images/shtg.png'),
+          imgdata: require("@/assets/images/shtg.png"),
-        }, {
+        },
+        {
           name: "驳回",
-          imgdata: require('@/assets/images/shbh.png'),
+          imgdata: require("@/assets/images/shbh.png"),
-        }
+        },
-      ]
+      ];
-      let item = listsna.find(item => iswenzi.includes(item.name))
+      let item = listsna.find((item) => iswenzi.includes(item.name));
       if (item) {
-        return item.imgdata
+        return item.imgdata;
       } else {
-        return require('@/assets/images/wctj.png')
+        return require("@/assets/images/wctj.png");
       }
-
     },
     assetLcpageList() {
       let obj = {
-        taskId: this.$route.query.id || this.$route.meta.id
+        taskId: this.$route.query.id || this.$route.meta.id,
-      }
+      };
-      assetLcpage(obj).then(res => {
+      assetLcpage(obj).then((res) => {
-        this.timeLineData = res.data
+        this.timeLineData = res.data;
-      })
+      });
     },
-    importClose() { },
+    importClose() {},
 
     goInfo(type, row) {
       // 查看
       if (type == 1) {
         this.$router.push({
-          name: 'mytaskAuditInfo', query: {
+          name: "mytaskAuditInfo",
+          query: {
             pageType: "look",
             taskId: row.taskId,
             assetId: row.id,
             type: this.activeName,
-
+          },
-
+        });
-          }
-        })
       }
       //审核
       if (type == 2) {
         this.$router.push({
-          name: 'mytaskAuditInfo', query: {
+          name: "mytaskAuditInfo",
+          query: {
             pageType: "change",
             taskId: row.taskId,
             assetId: row.id,
             type: this.activeName,
-
+          },
-          }
+        });
-        })
       }
       //查看不通过原因
       if (type == 3) {
-        this.chakanyuanyin = row.btgyy
+        this.chakanyuanyin = row.btgyy;
-        this.$refs.liebiaoDialog.open()
+        this.$refs.liebiaoDialog.open();
-
       }
       // getassetTaskid(row.id)
-
     },
     taskstatus(id) {
       if (id) {
         let obj = {
           0: "已关闭",
           1: "进行中",
-          2: "正常完成", 3: "超期完成", 4: "正常完成", 5: "审核驳回"
+          2: "正常完成",
-        }
+          3: "超期完成",
-        return obj[id]
+          4: "正常完成",
+          5: "审核驳回",
+        };
+        return obj[id];
       } else {
-        return "-"
+        return "-";
       }
     },
     //根据传入的类型，去分发状态
     titleInfoObjtype(type = "0,1") {
       console.log(type);
-      let list = type.split(",")
+      let list = type.split(",");
       //顶部展示
-      this.listTow = []
+      this.listTow = [];
       //tab的分页状态
-      this.chanckListTow = []
+      this.chanckListTow = [];
-      this.chanckList.forEach(res => {
+      this.chanckList.forEach((res) => {
-        list.forEach(element => {
+        list.forEach((element) => {
           if (element == res.lable) {
-            this.listTow.push(res.conent)
+            this.listTow.push(res.conent);
-            this.chanckListTow.push(res)
+            this.chanckListTow.push(res);
           }
         });
-      })
+      });
       //tab的下标
-      this.activeName = this.chanckListTow[0].lable
+      this.activeName = this.chanckListTow[0].lable;
       if (localStorage.getItem("activeName")) {
-        this.activeName = localStorage.getItem("activeName")
+        this.activeName = localStorage.getItem("activeName");
-        localStorage.setItem("activeName", this.activeName)
+        localStorage.setItem("activeName", this.activeName);
       }
       //动态列表
-      let listname = this.chanckListTow.filter(item => item.lable == this.activeName)
+      let listname = this.chanckListTow.filter(
+        (item) => item.lable == this.activeName
+      );
       if (listname) {
-        this.xtmcName = listname[0].xtmcName
+        this.xtmcName = listname[0].xtmcName;
-
       }
       this.handleQuery();
     },
     titleInfo() {
-      getassetTaskid(this.$route.query.id || this.$route.meta.id).then(res => {
+      getassetTaskid(this.$route.query.id || this.$route.meta.id).then(
-        if (res.code == 200) {
+        (res) => {
-          this.titleInfoObj = res.data
+          if (res.code == 200) {
-          // this.$set(this.titleInfoObj,'type',"0,1")
+            this.titleInfoObj = res.data;
-          this.titleInfoObjtype(this.titleInfoObj.type)
+            // this.$set(this.titleInfoObj,'type',"0,1")
+            this.titleInfoObjtype(this.titleInfoObj.type);
+          }
         }
-      })
+      );
-
     },
     // 重置
     resetQuery() {
-      this.activeName = this.chanckListTow[0].lable
+      this.activeName = this.chanckListTow[0].lable;
-
 
       this.pagination = {
         current: 1,
         size: 10,
         type: this.activeName,
-
+      };
-      }
       if (this.index == 1) {
         this.formInline = {
           type: this.activeName,
-
+        };
-        }
+        localStorage.removeItem("ismypaginationTow");
-        localStorage.removeItem("ismypaginationTow")
 
         this.getList();
       } else if (this.index == 2) {
         this.formInlineTwo = {
           unitName: "",
-        }
+        };
         this.getListTwo();
       }
     },
@@ -475,16 +592,18 @@ export default {
         current: 1,
         size: 10,
         type: this.activeName,
-      }
+      };
       if (this.index == 1) {
-
         this.pagination = { ...this.pagination, ...this.formInline };
 
-        this.formInline.isfanhuiTow = false
+        this.formInline.isfanhuiTow = false;
         console.log(77777, this.formInline);
         console.log(88888, this.pagination);
 
-        localStorage.setItem("ismypaginationTow", JSON.stringify(this.formInline))
+        localStorage.setItem(
+          "ismypaginationTow",
+          JSON.stringify(this.formInline)
+        );
 
         this.getList();
       } else if (this.index == 2) {
@@ -503,69 +622,70 @@ export default {
     },
     // 切换tab
     activeTab(id) {
-      this.index = id
+      this.index = id;
       if (id == 1) {
         this.formInline = {
           unit: "",
           type: "",
           status: "",
-        }
+        };
         this.getList();
       } else {
         this.formInlineTwo = {
           unitName: "",
-        }
+        };
         this.getList();
       }
     },
     getList() {
-      this.loading = true
+      this.loading = true;
-      this.pagination.taskId = this.$route.query.id || this.$route.meta.id
+      this.pagination.taskId = this.$route.query.id || this.$route.meta.id;
       // this.pagination.dwmc = this.$route.query.dwmc || this.$route.meta.dwmc
+      this.pagination.type = this.activeName;
       if (this.$store.state.user.roles.includes("unit")) {
-        this.pagination.dwmc = this.$store.state.user.useer.nickName
+        this.pagination.dwmc = this.$store.state.user.useer.nickName;
       }
-      geassetTaskcHc(this.pagination).then(res => {
+      geassetTaskcHc(this.pagination).then((res) => {
-
+        this.tableData = res.data.records;
-        this.tableData = res.data.records
+        this.loading = false;
-        this.loading = false
+        this.total = res.data.total;
-        this.total = res.data.total
+      });
-      })
     },
-    getListTwo() { },
+    getListTwo() {},
     // 修改table背景色
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {
-        return 'evenNumber-row';
+        return "evenNumber-row";
       }
-      return '';
+      return "";
     },
     // 屏幕尺寸变化
     cancalDebounce() {
-      const element = document.getElementById('L-size-main'); // 通过元素的 ID 获取元素
+      const element = document.getElementById("L-size-main"); // 通过元素的 ID 获取元素
-      const header = document.getElementById('L-header'); // 通过元素的 ID 获取元素
+      const header = document.getElementById("L-header"); // 通过元素的 ID 获取元素
-      const tab = document.getElementById('L-tab'); // 通过元素的 ID 获取元素
+      const tab = document.getElementById("L-tab"); // 通过元素的 ID 获取元素
-      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById("L-pagination"); // 通过元素的 ID 获取元素
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
       const tabHeight = tab.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 160;
+      this.tabHeader =
-    }
+        elementHeight - headerHeight - paginationtHeight - tabHeight - 160;
+    },
   },
   beforeRouteEnter(to, from, next) {
-    if (to.query.pageType == 'info') {
+    if (to.query.pageType == "info") {
-      to.meta.title = '资产核查'
+      to.meta.title = "资产核查";
-      to.meta.pageType = to.query.pageType
+      to.meta.pageType = to.query.pageType;
-      to.meta.id = to.query.id
+      to.meta.id = to.query.id;
-    } else if (to.query.pageType == 'look') {
+    } else if (to.query.pageType == "look") {
-      to.meta.title = '任务详情'
+      to.meta.title = "任务详情";
-      to.meta.pageType = to.query.pageType
+      to.meta.pageType = to.query.pageType;
-      to.meta.id = to.query.id
+      to.meta.id = to.query.id;
     }
     next();
   },
-}
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-timeline {
@@ -577,7 +697,8 @@ export default {
   padding-right: 3px;
 }
 
-.look-info {}
+.look-info {
+}
 
 ::v-deep .el-dialog {
   margin-top: 20vh !important;

src/views/unitPages/unitInfo/index.vue

@@ -469,22 +469,23 @@
               </el-col>
             </el-row>
           </el-row>
-          <!-- 检查信息 -->
+          <!-- 检查信息     
+           :rules="[
+                    {
+                      required: true,
+                      message: '请选择时间',
+                      trigger: ['change']
+                    }
+                  ]"-->
           <el-row style="margin: 10px 0;">
             <span class="top-title-box">检查信息</span>
           </el-row>
           <div v-for="(domain, index) in ruleForm.jcxxList" :key="domain.key" :prop="'jcxxList.' + index + '.value'">
             <el-row style="display: flex;">
               <el-col :span="8">
-                <el-form-item class="daoqitixingren" required :label="'时间' + (index == 0 ? '' : index)"
+                <el-form-item class="daoqitixingren"  :label="'时间' + (index == 0 ? '' : index)"
-                  :prop="`jcxxList[${index}].sj`"
+                  
-                  :rules="[
+               
-                    {
-                      required: true,
-                      message: '请选择时间',
-                      trigger: ['change']
-                    }
-                  ]"
                 >
                   <el-date-picker
                     v-model="domain.sj"
@@ -497,12 +498,12 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item class="daoqitixingren" :label="'系统域名' + (index == 0 ? '' : index)">
-                  <el-input v-model="domain.tyshxydm" :placeholder="disabled ? '':'请输入系统域名'"></el-input>
+                  <el-input v-model="domain.xtym" :placeholder="disabled ? '':'请输入系统域名'"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="7">
                 <el-form-item class="daoqitixingren" :label="'系统名称' + (index == 0 ? '' : index)">
-                  <el-input v-model="domain.lxdh" :placeholder="disabled ? '':'请输入系统名称'"></el-input>
+                  <el-input v-model="domain.xthc" :placeholder="disabled ? '':'请输入系统名称'"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="1" style="text-align: center;" v-if="isDisabled">
@@ -532,7 +533,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="'检查结果' + (index == 0 ? '' : index)">
-                  <el-input type="textarea" resize="none" :placeholder="disabled ? '':'请输入检查结果'" :rows="5" v-model="domain.xgyw_ywms"></el-input>
+                  <el-input type="textarea" resize="none" :placeholder="disabled ? '':'请输入检查结果'" :rows="5" v-model="domain.jcjg"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -574,7 +575,7 @@
           </el-row>
           <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
             <el-button type="danger" @click="cancel" :disabled="false" v-if="isDisabled">取消</el-button>
-            <el-button type="warning" @click="editUnit" v-if="!isDisabled" :disabled="isDisabled">编辑</el-button>
+            <el-button type="warning" @click="editUnit" v-if="!isDisabled && nickName != 'admin'" :disabled="isDisabled">编辑</el-button>
             <el-button type="primary" @click="newUnit" :disabled="false" v-if="isDisabled">确定</el-button>
           </el-row>
         </el-form>
@@ -585,10 +586,13 @@
 <script>
 import pcas from "@/utils/pca-code.json"
 import { unitOwnInfo, unitEditOwn } from "@/api/auditPagesApi/index";
+import { mapGetters } from 'vuex'
+
 import { MessageBox } from 'element-ui'
 export default {
   dicts:['zc_xtzyx', 'is_no', 'sshy', 'dwlx', 'dwjs', 'dwzsxz', 'dbxx_dbdj'],
   data() {
+
     const validateTyshxydm = (rule, value, callback) => {
       const pattern = /^[a-zA-Z0-9]{18}$/;
       if (!pattern.test(value)) {
@@ -723,9 +727,31 @@ export default {
       loading:false,
     }
   },
+  computed: {
+    // visitedViews() {
+    //   return this.$store.state.tagsView.visitedViews
+    // },
+    // routes() {
+    //   return this.$store.state.permission.routes
+    // },
+    // theme() {
+    //   return this.$store.state.settings.theme;
+    // }
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
   mounted(){
-    this.getInfo()
+    console.log(this.nickName);
+    
+    if(this.nickName == "admin"){
     this.disabled = true;
+
+    }else{
+      this.getInfo()
+      this.disabled = true;
+    }
+   
     // this.$nextTick(()=>{
     //   const inputElements = document.querySelectorAll('.el-input__inner');
     //   const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
@@ -835,7 +861,13 @@ export default {
           }).catch(err=>{
             this.loading = false;
           })
-        }
+        } else {
+
+            this.$message({
+              type: 'info',
+              message: '请填写完整'
+            });
+          }
       })
     },
     cancel(){

vue.config.js

@@ -18,8 +18,8 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/",
+  // publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/",
-  // publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）