资产自审核，自修改

src/api/auditPagesApi/index.js

@@ -243,7 +243,9 @@ export function schema(type){
   })
 }
 
-// 单位端资产编辑
+// -----------------------------------------
+
+// web资产--单位端资产编辑
 export function unitEdit(data){
   return request({
     url:"/tc/assetCurrent/unitEdit",
@@ -252,33 +254,189 @@ export function unitEdit(data){
   })
 }
 
-// 单位端资产重新编辑
-export function againUnitEdit(data){
+
+// web资产--管理端资产审核
+export function assetAudit(data){
   return request({
-    url:"/tc/assetCurrent/againUnitEdit",
+    url:"/tc/assetCurrent/audit",
     method:"post",
     data
   })
 }
 
-// 管理端资产审核
-export function assetAudit(data){
+// web资产--分页查询管理端/单位端审核列表
+export function getAuditList(params){
   return request({
-    url:"/tc/assetCurrent/audit",
+    url:"/tc/assetCurrent/getAuditList",
+    method:"get",
+    params
+  })
+}
+
+// web资产--单位端查看中间数据详情
+export function lookInfo(id){
+  return request({
+    url:"/tc/assetCurrent/lookInfo/" + id,
+    method:"get",
+  })
+}
+
+// ------------------------------------------
+
+// 小程序资产--单位端资产编辑
+export function miniProgramsUnitEdit(data){
+  return request({
+    url:"/tc/miniPrograms/unitEdit",
     method:"post",
     data
   })
 }
 
-// 分页查询管理端/单位端审核列表
-export function getAuditList(params){
+
+// 小程序资产--管理端资产审核
+export function miniProgramsAudit(data){
   return request({
-    url:"/tc/assetCurrent/getAuditList",
+    url:"/tc/miniPrograms/audit",
+    method:"post",
+    data
+  })
+}
+
+// 小程序资产--分页查询管理端/单位端审核列表
+export function miniProgramsGetAuditList(params){
+  return request({
+    url:"/tc/miniPrograms/getAuditList",
+    method:"get",
+    params
+  })
+}
+
+// 小程序资产--单位端查看中间数据详情
+export function miniProgramsLookInfo(id){
+  return request({
+    url:"/tc/miniPrograms/lookInfo/" + id,
+    method:"get",
+  })
+}
+
+
+// ------------------------------------------
+
+// 公众号资产--单位端资产编辑
+export function gzhUnitEdit(data){
+  return request({
+    url:"/tc/assetOfficialAccount/unitEdit",
+    method:"post",
+    data
+  })
+}
+
+
+// 公众号资产--管理端资产审核
+export function gzhAudit(data){
+  return request({
+    url:"/tc/assetOfficialAccount/audit",
+    method:"post",
+    data
+  })
+}
+
+// 公众号资产--分页查询管理端/单位端审核列表
+export function gzhGetAuditList(params){
+  return request({
+    url:"/tc/assetOfficialAccount/getAuditList",
+    method:"get",
+    params
+  })
+}
+
+// 公众号资产--单位端查看中间数据详情
+export function gzhLookInfo(id){
+  return request({
+    url:"/tc/assetOfficialAccount/lookInfo/" + id,
+    method:"get",
+  })
+}
+
+
+// ------------------------------------------
+
+// 电子邮件资产--单位端资产编辑
+export function EmailUnitEdit(data){
+  return request({
+    url:"/tc/assetEmail/unitEdit",
+    method:"post",
+    data
+  })
+}
+
+
+// 电子邮件资产--管理端资产审核
+export function EmailAudit(data){
+  return request({
+    url:"/tc/assetEmail/audit",
+    method:"post",
+    data
+  })
+}
+
+// 电子邮件资产--分页查询管理端/单位端审核列表
+export function EmailList(params){
+  return request({
+    url:"/tc/assetEmail/getAuditList",
     method:"get",
     params
   })
 }
 
+// 电子邮件资产--单位端查看中间数据详情
+export function EmailLookInfo(id){
+  return request({
+    url:"/tc/assetEmail/lookInfo/" + id,
+    method:"get",
+  })
+}
+
+
+// ------------------------------------------
+
+// 移动应用系统资产--单位端资产编辑
+export function assetAppUnitEdit(data){
+  return request({
+    url:"/tc/assetApp/unitEdit",
+    method:"post",
+    data
+  })
+}
+
+
+// 移动应用系统资产--管理端资产审核
+export function AppAudit(data){
+  return request({
+    url:"/tc/assetApp/audit",
+    method:"post",
+    data
+  })
+}
+
+// 移动应用系统资产--分页查询管理端/单位端审核列表
+export function AppList(params){
+  return request({
+    url:"/tc/assetApp/getAuditList",
+    method:"get",
+    params
+  })
+}
+
+// 移动应用系统资产--单位端查看中间数据详情
+export function AppLookInfo(id){
+  return request({
+    url:"/tc/assetApp/lookInfo/" + id,
+    method:"get",
+  })
+}
+
+
 // 单位查看自己单位具体信息
 export function unitOwnInfo(){
   return request({
@@ -295,11 +453,3 @@ export function unitEditOwn(data){
     data
   })
 }
-
-// 单位端查看中间数据详情
-export function lookInfo(id){
-  return request({
-    url:"/tc/assetCurrent/lookInfo/" + id,
-    method:"get",
-  })
-}

src/views/auditPages/unitAutonomicFill/assetsAuth.vue

@@ -1,9 +1,9 @@
 <template>
   <assetsTypeOne :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-if="$route.query.type == 0" />
-  <assetsTypeTwo :pageType="$route.query.pageType" :audit="true" :id="$route.query.id" v-else-if="$route.query.type == 1" />
-  <assetsTypeThree :pageType="$route.query.pageType" :audit="true" :id="$route.query.id" v-else-if="$route.query.type == 2" />
-  <assetsTypeFour :pageType="$route.query.pageType" :audit="true" :id="$route.query.id" v-else-if="$route.query.type == 3" />
-  <assetsTypeFive :pageType="$route.query.pageType" :audit="true" :id="$route.query.id" v-else-if="$route.query.type == 4" />
+  <assetsTypeTwo :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 1" />
+  <assetsTypeThree :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 2" />
+  <assetsTypeFour :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 3" />
+  <assetsTypeFive :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 4" />
 </template>
 <script>
 // web资产

src/views/auditPages/unitAutonomicFill/index.vue

@@ -52,13 +52,13 @@
         <el-table v-loading="loading" :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="资产名称" key="xtmc" prop="xtmc" align="center" />
-          <el-table-column label="所属单位" key="dwmc" prop="dwmc" align="center">
-            <!-- <template slot-scope="scope">
-              <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
-            </template> -->
-          </el-table-column>
+          <el-table-column label="资产名称" key="xtmc" prop="xtmc" align="center" v-if="btnShow == 'web'" />
+          <el-table-column label="所属单位" key="dwmc" prop="dwmc" align="center" v-if="btnShow == 'web'" />
+          <el-table-column label="资产名称" key="xcxmc" prop="xcxmc" align="center" v-if="btnShow == 'xcx'" />
+          <el-table-column label="资产名称" key="gzhmc" prop="gzhmc" align="center" v-if="btnShow == 'gzh'" />
+          <el-table-column label="资产名称" key="dzyxhz" prop="dzyxhz" align="center" v-if="btnShow == 'emil'" />
+          <el-table-column label="资产名称" key="appName" prop="appName" align="center" v-if="btnShow == 'app'" />
+          <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" v-if="btnShow !== 'web'" />
           <el-table-column label="审核状态" key="auditState" width="200px" prop="auditState" class-name="table-status"
             align="center">
             <template slot-scope="scope">
@@ -113,7 +113,7 @@ import myPagination from "@/views/components/Pagination/index.vue"
 import myDialog from "@/views/components/myDialog/index.vue"
 import danweiList from "@/views/system/user/danweiList.vue"
 import { addassetTaskadd, getassetTask, getassetTaskid, assetTaskclose } from "@/api/renwuApi/index.js"
-import { getAuditList } from "@/api/auditPagesApi/index.js"
+import { getAuditList, miniProgramsGetAuditList, gzhGetAuditList, EmailList, AppList } from "@/api/auditPagesApi/index.js"
 
 export default {
   // dicts: ['jjh_project_type', 'bms_approval_status', "project_middle_type", "project_small_type", "project_categories"],
@@ -170,19 +170,35 @@ export default {
     getInfo(id) {
       this.loading = true;
       if(id == 1) {
-        getAuditList(this.pagination).then(res => {
+        getAuditList(this.pagination).then(res=>{
           this.loading = false;
           this.total = res.data.total;
           this.tableData = res.data.records;
         })
       } else if(id == 2) {
-
+        miniProgramsGetAuditList(this.pagination).then(res=>{
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+        })
       } else if(id == 3) {
-        
+        gzhGetAuditList(this.pagination).then(res=>{
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+        })
       } else if(id == 4) {
-        
+        EmailList(this.pagination).then(res=>{
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+        })
       } else if(id == 5) {
-        
+        AppList(this.pagination).then(res=>{
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+        })
       }
     },
     // 重置
@@ -240,7 +256,7 @@ export default {
         name: 'unitAssetsAuth', query: {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "look",
-          id: row.currentId
+          id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
         }
       })
     },
@@ -250,7 +266,7 @@ export default {
         name: 'unitAssetsAuth', query: {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "change",
-          id: row.currentId
+          id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
         }
       })
     },
@@ -261,7 +277,7 @@ export default {
         case 'web':
           this.getInfo(1)
           break;
-        case 'xzx':
+        case 'xcx':
           this.getInfo(2)
           break;
         case 'gzh':

src/views/components/myAssetsType/index.vue

@@ -2722,7 +2722,7 @@
           </div>
           <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-button type="primary" @click="newAssets" :loading="loading">提交</el-button>
           </el-row>
           <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="audit">
             <el-button type="danger" :disabled="false" @click="btnReject">不通过</el-button>
@@ -3349,7 +3349,7 @@ export default {
             unitEdit(this.ruleForm).then(res=>{
               // console.log(res,"res");
               this.loading = false;
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
               this.$router.go(-1);
             }).catch(err=>{
               this.loading = false;

src/views/components/myAssetsType/index_v1.vue

@@ -260,21 +260,41 @@
           </el-row>
           <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-button type="primary" @click="newAssets" :loading="loading">提交</el-button>
           </el-row>
           <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="audit">
             <el-button type="danger" :disabled="false" @click="btnReject">不通过</el-button>
-            <el-button type="primary" :disabled="false" @click="newAssets" :loading="loading">通过</el-button>
+            <el-button type="primary" :disabled="false" @click="btnPass" :loading="loading">通过</el-button>
           </el-row>
         </el-form>
       </div>
     </div>
+    <my-dialog title="提示" ref="liebiaoDialog" class="taskDialogBox" width="40%">
+      <el-row>
+        <el-col :span="21">
+          <el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
+            <el-form-item label="不通过原因:" prop="auditYy">
+              <el-input v-model="dialogruleForm.auditYy" placeholder="请输入不通过原因"></el-input>
+            </el-form-item>
+            <el-form-item class="newTask-form-item">
+              <el-button @click="resetForm('dialogruleForm')">取消</el-button>
+              <el-button type="primary" @click="submitForm('dialogruleForm')">确定</el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
+    </my-dialog>
   </div>
 </template>
 <script>
-import { assetMiniPrograms, miniProgramsInfo, unitAllList } from "@/api/auditPagesApi/index";
+import { assetMiniPrograms, miniProgramsInfo, unitAllList, miniProgramsLookInfo, miniProgramsUnitEdit, miniProgramsAudit } from "@/api/auditPagesApi/index";
+import myDialog from "@/views/components/myDialog/index.vue"
 export default {
   dicts:['app_xzqh','app_sshy','app_zdhy','gzh_state','gzh_rzzt','gzh_rzlx','email_state'],
+  components:{
+    myDialog
+  },
   data() {
     return {
       ruleForm:{
@@ -288,17 +308,17 @@ export default {
           { required: true, message: "小程序名称不能为空", trigger: "blur" }
         ],
         appId: [
-          { required: true, message: "APPID不能为空", trigger: "blue" }
+          { required: true, message: "APPID不能为空", trigger: "blur" }
         ],
         rzzt: [
-          { required: true, message: "认证主体不能为空", trigger: "blue" }
+          { required: true, message: "认证主体不能为空", trigger: "blur" }
         ],
       
         state: [
           { required: true, message: "小程序状态不能为空", trigger: "change" }
         ],
         ysId: [
-          { required: true, message: "账号原始ID不能为空", trigger: "blue" }
+          { required: true, message: "账号原始ID不能为空", trigger: "blur" }
         ],
         packState: [
           { required: true, message: "小程序包状态不能为空", trigger: "change" }
@@ -313,13 +333,13 @@ export default {
           { required: true, message: "认证类型不能为空", trigger: "change" }
         ],
         icpState: [
-          { required: true, message: "icp备案状态不能为空", trigger: "blue" }
+          { required: true, message: "icp备案状态不能为空", trigger: "blur" }
         ],
         ymbmd: [
-          { required: true, message: "域名白名单不能为空", trigger: "blue" }
+          { required: true, message: "域名白名单不能为空", trigger: "blur" }
         ],
         fwlm: [
-          { required: true, message: "服务类目不能为空", trigger: "blue" }
+          { required: true, message: "服务类目不能为空", trigger: "blur" }
         ],
       
         sshy: [
@@ -332,52 +352,82 @@ export default {
           { required: true, message: "行政区划不能为空", trigger: "change" }
         ],
         xtzrr: [
-          { required: true, message: "系统责任人不能为空", trigger: "blue" }
+          { required: true, message: "系统责任人不能为空", trigger: "blur" }
         ],
         
         xtzrryx: [
-          { required: true, message: "系统责任人邮箱不能为空", trigger: "blue" },
-          { type: 'email', message: "请输入正确的邮箱地址", trigger: ["change", "blue"] }
+          { required: true, message: "系统责任人邮箱不能为空", trigger: "blur" },
+          { type: 'email', message: "请输入正确的邮箱地址", trigger: ["change", "blur"] }
         ],
         xtzrrdz: [
-          { required: true, message: "系统责任人地址不能为空", trigger: "blue" }
+          { required: true, message: "系统责任人地址不能为空", trigger: "blur" }
         ],
         yycjAppid: [
-          { required: true, message: "引入插件（APPID）不能为空", trigger: "blue" }
+          { required: true, message: "引入插件（APPID）不能为空", trigger: "blur" }
         ],
         yycjKfz: [
-          { required: true, message: "引用插件（开发者）不能为空", trigger: "blue" }
+          { required: true, message: "引用插件（开发者）不能为空", trigger: "blur" }
         ],
         xtjj: [
-          { required: true, message: "系统简介不能为空", trigger: "blue" }
+          { required: true, message: "系统简介不能为空", trigger: "blur" }
         ]
       },
       loading:false,
       disabled:false,
+      dialogruleForm:{
+        auditYy:'',
+      },
+      dialogruleFormrules:{
+        auditYy: [
+          { required: true, message: '请输入', trigger: 'blur' },
+        ],
+      },
     }
   },
-  props:['pageType', 'id', 'audit'],
+  props:['pageType', 'id', 'audit', 'isModdle'],
   mounted(){
-    console.log(this.audit,"audit");
-    if(this.pageType == 'look') {
-      this.getInfo(this.id)
-      this.disabled = true;
-      this.$nextTick(()=>{
-        const inputElements = document.querySelectorAll('.el-input__inner');
-        const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
-        inputElements.forEach((input) => {
-          input.placeholder = '';
-        });
-        textareaInputElements.forEach((input) => {
-          input.placeholder = '';
-        });
-      })
-    } else if(this.pageType == 'change') {
-      this.getInfo(this.id)
-      this.disabled = false;
-    }
-    if(this.audit) {
-      this.disabled = true;
+    if(this.isModdle) {
+      if(this.pageType == 'look') {
+        this.getInfoTwo(this.id)
+        this.disabled = true;
+        this.$nextTick(()=>{
+          const inputElements = document.querySelectorAll('.el-input__inner');
+          const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+          inputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+          textareaInputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+        })
+      } else if(this.pageType == 'change') {
+        this.getInfoTwo(this.id)
+        this.disabled = false;
+      }
+      if(this.audit) {
+        this.disabled = true;
+      }
+    } else {
+      if(this.pageType == 'look') {
+        this.getInfo(this.id)
+        this.disabled = true;
+        this.$nextTick(()=>{
+          const inputElements = document.querySelectorAll('.el-input__inner');
+          const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+          inputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+          textareaInputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+        })
+      } else if(this.pageType == 'change') {
+        this.getInfo(this.id)
+        this.disabled = false;
+      }
+      if(this.audit) {
+        this.disabled = true;
+      }
     }
   },
   methods:{
@@ -389,6 +439,14 @@ export default {
         }, 100);
       })
     },
+    getInfoTwo(id) {
+      miniProgramsLookInfo(id).then(res=>{
+        this.ruleForm = res.data;
+        setTimeout(() => {
+          this.$refs.ruleForm.clearValidate()
+        }, 100);
+      })
+    },
     // 单位名称模糊查询
     querySearchAsync(queryString, cb){
       let results = [];
@@ -413,9 +471,9 @@ export default {
         if(valid) {
           this.loading = true;
           if(this.pageType == 'change') {
-            assetMiniPrograms('put',this.ruleForm).then(res=>{
+            miniProgramsUnitEdit(this.ruleForm).then(res=>{
               this.loading = false;
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
               this.$router.go(-1);
             })
           } else {
@@ -431,8 +489,48 @@ export default {
     sendBack(){
       this.$router.go(-1);
     },
+    // 驳回按钮
     btnReject(){
-
+      this.$refs.liebiaoDialog.open()
+    },
+    // 驳回输入驳回原因点击取消按钮
+    resetForm() {
+      this.dialogruleForm = {
+        auditYy:""
+      }
+      this.$refs.liebiaoDialog.close()
+    },
+    // 驳回输入驳回原因点击确定按钮
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let tijioaobj = {
+            auditState: '3',
+            auditYy: this.dialogruleForm.auditYy,
+            currentId: Number(this.id),
+          }
+          miniProgramsAudit(tijioaobj).then(res=>{
+            if(res.code == 200){
+              this.$modal.msgSuccess("审核驳回");
+              this.$router.go(-1);
+            }
+          })
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    // 通过按钮
+    btnPass(){
+      this.loading = true;
+      miniProgramsAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
+        this.$modal.msgSuccess("审核通过");
+        this.$router.go(-1);
+        this.loading = false;
+      }).catch(err=>{
+        this.loading = false;
+      })
     },
   },
 }

src/views/components/myAssetsType/index_v2.vue

@@ -256,8 +256,8 @@
           <div v-else>
             <el-row>
               <el-col :span="12">
-                <el-form-item class="daoqitixingren" label="统一社会信用代码" required>
-                  <el-form-item prop="tyshxydm"
+                <!-- <el-form-item> -->
+                  <el-form-item prop="tyshxydm"  class="daoqitixingren" label="统一社会信用代码" required
                     :rules="[
                       {
                         pattern: /^[a-zA-Z0-9]{18}$/,
@@ -268,7 +268,7 @@
                   >
                     <el-input v-model="ruleForm.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
-                </el-form-item>
+                <!-- </el-form-item> -->
               </el-col>
               <el-col :span="12">
                 <el-form-item label="账号名称" prop="gzhmc"
@@ -365,8 +365,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="系统责任人电话" required>
-                  <el-form-item prop="xtzrrdh"
+                <!-- <el-form-item label="系统责任人电话" required> -->
+                  <el-form-item prop="xtzrrdh" label="系统责任人电话" required
                     :rules="[
                       {
                         pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -377,13 +377,13 @@
                   >
                     <el-input v-model="ruleForm.xtzrrdh" style="width: 100%;" placeholder="请输入系统责任人电话"></el-input>
                   </el-form-item>
-                </el-form-item>
+                <!-- </el-form-item> -->
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="系统责任人邮箱" required>
-                  <el-form-item prop="xtzrryx"
+                <!-- <el-form-item> -->
+                  <el-form-item prop="xtzrryx" label="系统责任人邮箱" required
                     :rules="[
                       {
                         type: 'email',
@@ -394,7 +394,7 @@
                   >
                     <el-input v-model="ruleForm.xtzrryx" style="width: 100%;" placeholder="请输入系统责任人邮箱"></el-input>
                   </el-form-item>
-                </el-form-item>
+                <!-- </el-form-item> -->
               </el-col>
               <el-col :span="12">
                 <el-form-item label="系统责任人地址" required prop="xtzrrdz">
@@ -412,21 +412,41 @@
           </div>
           <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-button type="primary" @click="newAssets" :loading="loading">提交</el-button>
           </el-row>
           <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="audit">
             <el-button type="danger" :disabled="false" @click="btnReject">不通过</el-button>
-            <el-button type="primary" :disabled="false" @click="newAssets" :loading="loading">通过</el-button>
+            <el-button type="primary" :disabled="false" @click="btnPass" :loading="loading">通过</el-button>
           </el-row>
         </el-form>
       </div>
     </div>
+    <my-dialog title="提示" ref="liebiaoDialog" class="taskDialogBox" width="40%">
+      <el-row>
+        <el-col :span="21">
+          <el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
+            <el-form-item label="不通过原因:" prop="auditYy">
+              <el-input v-model="dialogruleForm.auditYy" placeholder="请输入不通过原因"></el-input>
+            </el-form-item>
+            <el-form-item class="newTask-form-item">
+              <el-button @click="resetForm('dialogruleForm')">取消</el-button>
+              <el-button type="primary" @click="submitForm('dialogruleForm')">确定</el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
+    </my-dialog>
   </div>
 </template>
 <script>
-import { assetOfficialAccount, assetOfficialAccountInfo, unitAllList } from "@/api/auditPagesApi/index";
+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'],
+  components:{
+    myDialog
+  },
   data() {
     return {
       ruleForm:{
@@ -440,10 +460,10 @@ export default {
           { required: true, message: "公众号名称不能为空", trigger: "blur" }
         ],
         wxh: [
-          { required: true, message: "微信号不能为空", trigger: "change" }
+          { required: true, message: "微信号不能为空", trigger: "blur" }
         ],
         rzzt: [
-          { required: true, message: "认证主体不能为空", trigger: "change" }
+          { required: true, message: "认证主体不能为空", trigger: "blur" }
         ],
         tyshxydm: [
           { required: true, message: "统一社会信用代码不能为空", trigger: "change" },
@@ -453,7 +473,7 @@ export default {
           { required: true, message: "公众号状态不能为空", trigger: "change" }
         ],
         gzhId: [
-          { required: true, message: "公众号ID不能为空", trigger: "change" }
+          { required: true, message: "公众号ID不能为空", trigger: "blur" }
         ],
         gzhlx: [
           { required: true, message: "公众号类型不能为空", trigger: "change" }
@@ -477,63 +497,108 @@ export default {
           { required: true, message: "行政区划不能为空", trigger: "change" }
         ],
         xtzrr: [
-          { required: true, message: "系统责任人不能为空", trigger: "change" }
+          { required: true, message: "系统责任人不能为空", trigger: "blur" }
         ],
         xtzrrdh: [
-          { required: true, message: "系统责任人电话不能为空", trigger: "change" },
-          { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "change" }
+          { required: true, message: "系统责任人电话不能为空", trigger: "blur" },
+          { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }
         ],
         xtzrryx: [
           { required: true, message: "系统责任人邮箱不能为空", trigger: "change" },
-          { type: 'email', message: "请输入正确的邮箱地址", trigger: ['change', 'change'] }
+          { type: 'email', message: "请输入正确的邮箱地址", trigger: ['change', 'blur'] }
         ],
         xtzrrdz: [
-          { required: true, message: "系统责任人地址不能为空", trigger: "change" }
+          { required: true, message: "系统责任人地址不能为空", trigger: "blur" }
         ],
         cdmc: [
-          { required: true, message: "菜单信息（菜单名称）不能为空", trigger: "change" }
+          { required: true, message: "菜单信息（菜单名称）不能为空", trigger: "blur" }
         ],
         cdlj: [
-          { required: true, message: "菜单信息（菜单链接）不能为空", trigger: "change" }
+          { required: true, message: "菜单信息（菜单链接）不能为空", trigger: "blur" }
         ],
         cdlx: [
-          { required: true, message: "菜单信息（菜单类型）不能为空", trigger: "change" }
+          { required: true, message: "菜单信息（菜单类型）不能为空", trigger: "blur" }
         ],
         xtjj: [
-          { required: true, message: "系统简介不能为空", trigger: "change" }
+          { required: true, message: "系统简介不能为空", trigger: "blur" }
         ]
       },
       loading:false,
       disabled:false,
+      dialogruleForm:{
+        auditYy:'',
+      },
+      dialogruleFormrules:{
+        auditYy: [
+          { required: true, message: '请输入', trigger: 'blur' },
+        ],
+      },
     }
   },
-  props:['pageType', 'id', 'audit'],
+  props:['pageType', 'id', 'audit', 'isModdle'],
   mounted(){
-    if(this.pageType == 'look') {
-      this.getInfo(this.id)
-      this.disabled = true;
-      this.$nextTick(()=>{
-        const inputElements = document.querySelectorAll('.el-input__inner');
-        const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
-        inputElements.forEach((input) => {
-          input.placeholder = '';
-        });
-        textareaInputElements.forEach((input) => {
-          input.placeholder = '';
-        });
-      })
-    } else if(this.pageType == 'change') {
-      this.getInfo(this.id)
-      this.disabled = false;
-    }
-    if(this.audit) {
-      this.disabled = true;
+    if(this.isModdle) {
+      if(this.pageType == 'look') {
+        this.getInfoTwo(this.id)
+        this.disabled = true;
+        this.$nextTick(()=>{
+          const inputElements = document.querySelectorAll('.el-input__inner');
+          const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+          inputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+          textareaInputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+        })
+      } else if(this.pageType == 'change') {
+        this.getInfoTwo(this.id)
+        this.disabled = false;
+      }
+      if(this.audit) {
+        this.disabled = true;
+      }
+    } else {
+      if(this.pageType == 'look') {
+        this.getInfo(this.id)
+        this.disabled = true;
+        this.$nextTick(()=>{
+          const inputElements = document.querySelectorAll('.el-input__inner');
+          const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+          inputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+          textareaInputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+        })
+      } else if(this.pageType == 'change') {
+        this.getInfo(this.id)
+        this.disabled = false;
+      }
+      if(this.audit) {
+        this.disabled = true;
+      }
     }
   },
   methods:{
     getInfo(id){
       assetOfficialAccountInfo(id).then(res=>{
         this.ruleForm = res.data;
+        if(!this.ruleForm.ptlx) {
+          this.ruleForm.ptlx = '1'
+        }
+        setTimeout(() => {
+          this.$refs.ruleForm.clearValidate()
+        }, 100);
+      })
+    },
+    getInfoTwo(id){
+      gzhLookInfo(id).then(res=>{
+        this.ruleForm = res.data;
+        if(!this.ruleForm.ptlx) {
+          this.ruleForm.ptlx = '1'
+        }
         setTimeout(() => {
           this.$refs.ruleForm.clearValidate()
         }, 100);
@@ -558,10 +623,10 @@ export default {
         if(valid) {
           this.loading = true;
           if(this.pageType == 'change') {
-            assetOfficialAccount('put',this.ruleForm).then(res=>{
+            gzhUnitEdit(this.ruleForm).then(res=>{
               // console.log(res,"res");
               this.loading = false;
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
               this.$router.go(-1);
             })
           } else {
@@ -578,8 +643,48 @@ export default {
     sendBack(){
       this.$router.go(-1);
     },
+    // 驳回按钮
     btnReject(){
-
+      this.$refs.liebiaoDialog.open()
+    },
+    // 驳回输入驳回原因点击取消按钮
+    resetForm() {
+      this.dialogruleForm = {
+        auditYy:""
+      }
+      this.$refs.liebiaoDialog.close()
+    },
+    // 驳回输入驳回原因点击确定按钮
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let tijioaobj = {
+            auditState: '3',
+            auditYy: this.dialogruleForm.auditYy,
+            currentId: Number(this.id),
+          }
+          gzhAudit(tijioaobj).then(res=>{
+            if(res.code == 200){
+              this.$modal.msgSuccess("审核驳回");
+              this.$router.go(-1);
+            }
+          })
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    // 通过按钮
+    btnPass(){
+      this.loading = true;
+      gzhAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
+        this.$modal.msgSuccess("审核通过");
+        this.$router.go(-1);
+        this.loading = false;
+      }).catch(err=>{
+        this.loading = false;
+      })
     },
   },
 }

src/views/components/myAssetsType/index_v3.vue

@@ -201,21 +201,41 @@
           </el-row>
           <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-button type="primary" @click="newAssets" :loading="loading">提交</el-button>
           </el-row>
           <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="audit">
             <el-button type="danger" :disabled="false" @click="btnReject">不通过</el-button>
-            <el-button type="primary" :disabled="false" @click="newAssets" :loading="loading">通过</el-button>
+            <el-button type="primary" :disabled="false" @click="btnPass" :loading="loading">通过</el-button>
           </el-row>
         </el-form>
       </div>
     </div>
+    <my-dialog title="提示" ref="liebiaoDialog" class="taskDialogBox" width="40%">
+      <el-row>
+        <el-col :span="21">
+          <el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
+            <el-form-item label="不通过原因:" prop="auditYy">
+              <el-input v-model="dialogruleForm.auditYy" placeholder="请输入不通过原因"></el-input>
+            </el-form-item>
+            <el-form-item class="newTask-form-item">
+              <el-button @click="resetForm('dialogruleForm')">取消</el-button>
+              <el-button type="primary" @click="submitForm('dialogruleForm')">确定</el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
+    </my-dialog>
   </div>
 </template>
 <script>
-import { assetEmail, assetEmailInfo, unitAllList } from "@/api/auditPagesApi/index";
+import { assetEmail, assetEmailInfo, unitAllList, EmailLookInfo, EmailAudit, EmailUnitEdit } from "@/api/auditPagesApi/index";
+import myDialog from "@/views/components/myDialog/index.vue"
 export default {
   dicts:['app_xzqh','app_sshy','app_zdhy','email_jslx','email_state','email_hasorno'],
+  components:{
+    myDialog
+  },
   data() {
     return {
       ruleForm:{
@@ -232,10 +252,10 @@ export default {
           { required: true, message: "建设类型不能为空", trigger: "change" }
         ],
         yjxtgys: [
-          { required: true, message: "邮件系统供应商不能为空", trigger: "change" }
+          { required: true, message: "邮件系统供应商不能为空", trigger: "blur" }
         ],
         mmsf: [
-          { required: true, message: "密码算法不能为空", trigger: "change" }
+          { required: true, message: "密码算法不能为空", trigger: "blur" }
         ],
         yjxtzc: [
           { required: true, message: "邮件系统状态不能为空", trigger: "change" }
@@ -244,16 +264,16 @@ export default {
           { required: true, message: "安全防护系统不能为空", trigger: "change" }
         ],
         aqbfhj: [
-          { required: true, message: "安全备份环境不能为空", trigger: "change" }
+          { required: true, message: "安全备份环境不能为空", trigger: "blur" }
         ],
         szzscs: [
-          { required: true, message: "数字证书厂商不能为空", trigger: "change" }
+          { required: true, message: "数字证书厂商不能为空", trigger: "blur" }
         ],
         sxsj: [
           { required: true, message: "上线时间不能为空", trigger: "change" }
         ],
         sshy: [
-          { required: true, message: "所属行业不能为空", trigger: "change" }
+          { required: true, message: "所属行业不能为空", trigger: "blur" }
         ],
         zdhy: [
           { required: true, message: "重点行业不能为空", trigger: "change" }
@@ -262,41 +282,72 @@ export default {
           { required: true, message: "行政区划不能为空", trigger: "change" }
         ],
         xtzrr: [
-          { required: true, message: "系统责任人不能为空", trigger: "change" }
+          { required: true, message: "系统责任人不能为空", trigger: "blur" }
         ],
        
         xtzrrdz: [
-          { required: true, message: "系统责任人地址不能为空", trigger: "change" }
+          { required: true, message: "系统责任人地址不能为空", trigger: "blur" }
         ],
         jj: [
-          { required: true, message: "简介不能为空", trigger: "change" }
+          { required: true, message: "简介不能为空", trigger: "blur" }
         ]
       },
       loading:false,
       disabled:false,
+      dialogruleForm:{
+        auditYy:'',
+      },
+      dialogruleFormrules:{
+        auditYy: [
+          { required: true, message: '请输入', trigger: 'blur' },
+        ],
+      },
     }
   },
-  props:['pageType', 'id', 'audit'],
+  props:['pageType', 'id', 'audit', 'isModdle'],
   mounted(){
-    if(this.pageType == 'look') {
-      this.getInfo(this.id)
-      this.disabled = true;
-      this.$nextTick(()=>{
-        const inputElements = document.querySelectorAll('.el-input__inner');
-        const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
-        inputElements.forEach((input) => {
-          input.placeholder = '';
-        });
-        textareaInputElements.forEach((input) => {
-          input.placeholder = '';
-        });
-      })
-    } else if(this.pageType == 'change') {
-      this.getInfo(this.id)
-      this.disabled = false;
-    }
-    if(this.audit) {
-      this.disabled = true;
+    if(this.isModdle) {
+      if(this.pageType == 'look') {
+        this.getInfoTwo(this.id)
+        this.disabled = true;
+        this.$nextTick(()=>{
+          const inputElements = document.querySelectorAll('.el-input__inner');
+          const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+          inputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+          textareaInputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+        })
+      } else if(this.pageType == 'change') {
+        this.getInfoTwo(this.id)
+        this.disabled = false;
+      }
+      if(this.audit) {
+        this.disabled = true;
+      }
+    } else {
+      if(this.pageType == 'look') {
+        this.getInfo(this.id)
+        this.disabled = true;
+        this.$nextTick(()=>{
+          const inputElements = document.querySelectorAll('.el-input__inner');
+          const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+          inputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+          textareaInputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+        })
+      } else if(this.pageType == 'change') {
+        this.getInfo(this.id)
+        this.disabled = false;
+      }
+      if(this.audit) {
+        this.disabled = true;
+      }
     }
   },
   methods:{
@@ -308,6 +359,14 @@ export default {
         }, 100);
       })
     },
+    getInfoTwo(id) {
+      EmailLookInfo(id).then(res=>{
+        this.ruleForm = res.data;
+        setTimeout(() => {
+          this.$refs.ruleForm.clearValidate()
+        }, 100);
+      })
+    },
     // 单位名称模糊查询
     querySearchAsync(queryString, cb){
       let results = [];
@@ -327,10 +386,10 @@ export default {
         if(valid) {
           this.loading = true;
           if(this.pageType == 'change') {
-            assetEmail('put',this.ruleForm).then(res=>{
+            EmailUnitEdit(this.ruleForm).then(res=>{
               // console.log(res,"res");
               this.loading = false;
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
               this.$router.go(-1);
             })
           } else {
@@ -347,8 +406,48 @@ export default {
     sendBack(){
       this.$router.go(-1);
     },
+    // 驳回按钮
     btnReject(){
-
+      this.$refs.liebiaoDialog.open()
+    },
+    // 驳回输入驳回原因点击取消按钮
+    resetForm() {
+      this.dialogruleForm = {
+        auditYy:""
+      }
+      this.$refs.liebiaoDialog.close()
+    },
+    // 驳回输入驳回原因点击确定按钮
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let tijioaobj = {
+            auditState: '3',
+            auditYy: this.dialogruleForm.auditYy,
+            currentId: Number(this.id),
+          }
+          EmailAudit(tijioaobj).then(res=>{
+            if(res.code == 200){
+              this.$modal.msgSuccess("审核驳回");
+              this.$router.go(-1);
+            }
+          })
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    // 通过按钮
+    btnPass(){
+      this.loading = true;
+      EmailAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
+        this.$modal.msgSuccess("审核通过");
+        this.$router.go(-1);
+        this.loading = false;
+      }).catch(err=>{
+        this.loading = false;
+      })
     },
   },
 }

src/views/components/myAssetsType/index_v4.vue

@@ -177,21 +177,41 @@
           </el-row>
           <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-button type="primary" @click="newAssets" :loading="loading">提交</el-button>
           </el-row>
           <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="audit">
             <el-button type="danger" :disabled="false" @click="btnReject">不通过</el-button>
-            <el-button type="primary" :disabled="false" @click="newAssets" :loading="loading">通过</el-button>
+            <el-button type="primary" :disabled="false" @click="btnPass" :loading="loading">通过</el-button>
           </el-row>
         </el-form>
       </div>
     </div>
+    <my-dialog title="提示" ref="liebiaoDialog" class="taskDialogBox" width="40%">
+      <el-row>
+        <el-col :span="21">
+          <el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
+            <el-form-item label="不通过原因:" prop="auditYy">
+              <el-input v-model="dialogruleForm.auditYy" placeholder="请输入不通过原因"></el-input>
+            </el-form-item>
+            <el-form-item class="newTask-form-item">
+              <el-button @click="resetForm('dialogruleForm')">取消</el-button>
+              <el-button type="primary" @click="submitForm('dialogruleForm')">确定</el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
+    </my-dialog>
   </div>
 </template>
 <script>
-import { assetApp, assetAppInfo, unitAllList } from "@/api/auditPagesApi/index";
+import { assetApp, assetAppInfo, unitAllList, AppLookInfo, AppAudit, assetAppUnitEdit } from "@/api/auditPagesApi/index";
+import myDialog from "@/views/components/myDialog/index.vue"
 export default {
-  dicts:['app_icp_state','app_sshy','app_zdhy','app_xzqh','app_aqjgqk'],
+  dicts:['app_icp_state','app_sshy','app_zdhy','app_xzqh','app_aqjgqk','gzh_state'],
+  components:{
+    myDialog
+  },
   data() {
     return {
       ruleForm:{
@@ -205,17 +225,17 @@ export default {
           { required: true, message: "移动应用名称不能为空", trigger: "blur" }
         ],
         pack: [
-          { required: true, message: "包名不能为空", trigger: "change" }
+          { required: true, message: "包名不能为空", trigger: "blur" }
         ],
         icpState: [
           { required: true, message: "icp备案状态不能为空", trigger: "change" }
         ],
         icpbah: [
-          { required: true, message: "icp备案号不能为空", trigger: "change" }
+          { required: true, message: "icp备案号不能为空", trigger: "blur" }
         ],
       
         wjm: [
-          { required: true, message: "文件名不能为空", trigger: "change" }
+          { required: true, message: "文件名不能为空", trigger: "blur" }
         ],
         sshy: [
           { required: true, message: "所属行业不能为空", trigger: "change" }
@@ -230,22 +250,22 @@ export default {
           { required: true, message: "安全加固情况不能为空", trigger: "change" }
         ],
         bbxx: [
-          { required: true, message: "版本信息不能为空", trigger: "change" }
+          { required: true, message: "版本信息不能为空", trigger: "blur" }
         ],
         bbh: [
-          { required: true, message: "版本信息（版本号）不能为空", trigger: "change" }
+          { required: true, message: "版本信息（版本号）不能为空", trigger: "blur" }
         ],
         bbxxMd5: [
-          { required: true, message: "版本信息（MD5）不能为空", trigger: "change" }
+          { required: true, message: "版本信息（MD5）不能为空", trigger: "blur" }
         ],
         bbxxSjpt: [
-          { required: true, message: "版本信息（上架平台）不能为空", trigger: "change" }
+          { required: true, message: "版本信息（上架平台）不能为空", trigger: "blur" }
         ],
         wjdx: [
-          { required: true, message: "文件大小不能为空", trigger: "change" }
+          { required: true, message: "文件大小不能为空", trigger: "blur" }
         ],
         jj: [
-          { required: true, message: "简介不能为空", trigger: "change" }
+          { required: true, message: "简介不能为空", trigger: "blur" }
         ],
         appState:[
           { required: true, message: "移动应用系统状态不能为空", trigger: "change" }
@@ -253,29 +273,60 @@ export default {
       },
       loading:false,
       disabled:false,
+      dialogruleForm:{
+        auditYy:'',
+      },
+      dialogruleFormrules:{
+        auditYy: [
+          { required: true, message: '请输入', trigger: 'blur' },
+        ],
+      },
     }
   },
-  props:['pageType', 'id', 'audit'],
+  props:['pageType', 'id', 'audit', 'isModdle'],
   mounted(){
-    if(this.pageType == 'look') {
-      this.getInfo(this.id)
-      this.disabled = true;
-      this.$nextTick(()=>{
-        const inputElements = document.querySelectorAll('.el-input__inner');
-        const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
-        inputElements.forEach((input) => {
-          input.placeholder = '';
-        });
-        textareaInputElements.forEach((input) => {
-          input.placeholder = '';
-        });
-      })
-    } else if(this.pageType == 'change') {
-      this.getInfo(this.id)
-      this.disabled = false;
-    }
-    if(this.audit) {
-      this.disabled = true;
+    if(this.isModdle) {
+      if(this.pageType == 'look') {
+        this.getInfoTwo(this.id)
+        this.disabled = true;
+        this.$nextTick(()=>{
+          const inputElements = document.querySelectorAll('.el-input__inner');
+          const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+          inputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+          textareaInputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+        })
+      } else if(this.pageType == 'change') {
+        this.getInfoTwo(this.id)
+        this.disabled = false;
+      }
+      if(this.audit) {
+        this.disabled = true;
+      }
+    } else {
+      if(this.pageType == 'look') {
+        this.getInfo(this.id)
+        this.disabled = true;
+        this.$nextTick(()=>{
+          const inputElements = document.querySelectorAll('.el-input__inner');
+          const textareaInputElements = document.querySelectorAll('.el-textarea__inner');
+          inputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+          textareaInputElements.forEach((input) => {
+            input.placeholder = '';
+          });
+        })
+      } else if(this.pageType == 'change') {
+        this.getInfo(this.id)
+        this.disabled = false;
+      }
+      if(this.audit) {
+        this.disabled = true;
+      }
     }
   },
   methods:{
@@ -287,6 +338,14 @@ export default {
         }, 100);
       })
     },
+    getInfoTwo(id){
+      AppLookInfo(id).then(res=>{
+        this.ruleForm = res.data;
+        setTimeout(() => {
+          this.$refs.ruleForm.clearValidate()
+        }, 100);
+      })
+    },
     // 单位名称模糊查询
     querySearchAsync(queryString, cb){
       let results = [];
@@ -306,10 +365,10 @@ export default {
         if(valid) {
           this.loading = true;
           if(this.pageType == 'change') {
-            assetApp('put',this.ruleForm).then(res=>{
+            assetAppUnitEdit(this.ruleForm).then(res=>{
               // console.log(res,"res");
               this.loading = false;
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("提交成功，待管理员审核通过后完成修改");
               this.$router.go(-1);
             })
           } else {
@@ -326,8 +385,48 @@ export default {
     sendBack(){
       this.$router.go(-1);
     },
+    // 驳回按钮
     btnReject(){
-
+      this.$refs.liebiaoDialog.open()
+    },
+    // 驳回输入驳回原因点击取消按钮
+    resetForm() {
+      this.dialogruleForm = {
+        auditYy:""
+      }
+      this.$refs.liebiaoDialog.close()
+    },
+    // 驳回输入驳回原因点击确定按钮
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let tijioaobj = {
+            auditState: '3',
+            auditYy: this.dialogruleForm.auditYy,
+            currentId: Number(this.id),
+          }
+          AppAudit(tijioaobj).then(res=>{
+            if(res.code == 200){
+              this.$modal.msgSuccess("审核驳回");
+              this.$router.go(-1);
+            }
+          })
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    // 通过按钮
+    btnPass(){
+      this.loading = true;
+      AppAudit({currentId:Number(this.id),auditState:"2"}).then(res=>{
+        this.$modal.msgSuccess("审核通过");
+        this.$router.go(-1);
+        this.loading = false;
+      }).catch(err=>{
+        this.loading = false;
+      })
     },
   },
 }

src/views/unitPages/assetRecord/index.vue

@@ -47,13 +47,13 @@
         <el-table v-loading="loading" :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="资产名称" key="xtmc" prop="xtmc" align="center" />
-          <el-table-column label="所属单位" key="dwmc" prop="dwmc" align="center">
-            <!-- <template slot-scope="scope">
-              <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
-            </template> -->
-          </el-table-column>
+          <el-table-column label="资产名称" key="xtmc" prop="xtmc" align="center" v-if="btnShow == 'web'" />
+          <el-table-column label="所属单位" key="dwmc" prop="dwmc" align="center" v-if="btnShow == 'web'" />
+          <el-table-column label="资产名称" key="xcxmc" prop="xcxmc" align="center" v-if="btnShow == 'xcx'" />
+          <el-table-column label="资产名称" key="gzhmc" prop="gzhmc" align="center" v-if="btnShow == 'gzh'" />
+          <el-table-column label="资产名称" key="dzyxhz" prop="dzyxhz" align="center" v-if="btnShow == 'emil'" />
+          <el-table-column label="资产名称" key="appName" prop="appName" align="center" v-if="btnShow == 'app'" />
+          <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" v-if="btnShow !== 'web'" />
           <el-table-column label="审核状态" key="auditState" width="200px" prop="auditState" class-name="table-status"
             align="center">
             <template slot-scope="scope">
@@ -76,7 +76,7 @@
                   <span class="look-info" style="color: #1485EF;">查看</span>
                 </div>
                 <!--  -->
-                <div v-if="scope.row.auditState == 2" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
+                <div v-if="scope.row.auditState == 2 || scope.row.auditState == 3" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
                   @click="delInfo(scope.row)">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="del-info" style="color: #1485EF;">编辑</span>
@@ -108,7 +108,7 @@ import myPagination from "@/views/components/Pagination/index.vue"
 import myDialog from "@/views/components/myDialog/index.vue"
 import danweiList from "@/views/system/user/danweiList.vue"
 import { addassetTaskadd, getassetTask, getassetTaskid, assetTaskclose } from "@/api/renwuApi/index.js"
-import { getAuditList } from "@/api/auditPagesApi/index.js"
+import { getAuditList, miniProgramsGetAuditList, gzhGetAuditList, EmailList, AppList } from "@/api/auditPagesApi/index.js"
 
 export default {
   // dicts: ['jjh_project_type', 'bms_approval_status', "project_middle_type", "project_small_type", "project_categories"],
@@ -176,13 +176,29 @@ export default {
           this.tableData = res.data.records;
         })
       } else if(id == 2) {
-
+        miniProgramsGetAuditList(this.pagination).then(res=>{
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+        })
       } else if(id == 3) {
-        
+        gzhGetAuditList(this.pagination).then(res=>{
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+        })
       } else if(id == 4) {
-        
+        EmailList(this.pagination).then(res=>{
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+        })
       } else if(id == 5) {
-        
+        AppList(this.pagination).then(res=>{
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+        })
       }
     },
     // 重置
@@ -240,7 +256,7 @@ export default {
         name: 'assetsAuthRecord', query: {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "look",
-          id: row.currentId
+          id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
         }
       })
     },
@@ -251,7 +267,7 @@ export default {
         name: 'assetsAuthRecord', query: {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "change",
-          id: row.currentId
+          id:  this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
         }
       })
     },
@@ -267,7 +283,7 @@ export default {
         case 'web':
           this.getInfo(1);
           break;
-        case 'xzx':
+        case 'xcx':
           this.getInfo(2);
           break;
         case 'gzh':

src/views/unitPages/myAssets/email.vue

@@ -79,7 +79,7 @@
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
                 </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
+                <div v-if="!scope.row.auditState || scope.row.auditState == 2" style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
                 </div>

src/views/unitPages/myAssets/index.vue

@@ -99,7 +99,7 @@
                   <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: 10px;" @click="goInfo(scope.row,2)">
+                <div v-if="!scope.row.auditState || scope.row.auditState == 2" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="goInfo(scope.row,2)">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
                 </div>

src/views/unitPages/myAssets/mobileApplication.vue

@@ -107,7 +107,7 @@
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
                 </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
+                <div v-if="!scope.row.auditState || scope.row.auditState == 2" style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
                 </div>

src/views/unitPages/myAssets/officialAccount.vue

@@ -108,7 +108,7 @@
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
                 </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
+                <div v-if="!scope.row.auditState || scope.row.auditState == 2" style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
                 </div>

src/views/unitPages/myAssets/program.vue

@@ -112,7 +112,7 @@
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
                 </div>
-                <div style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="goInfo(scope.row,2)">
+                <div v-if="!scope.row.auditState || scope.row.auditState == 2" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="goInfo(scope.row,2)">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
                 </div>