弹框样式

monkeyhouyi
1 parent 93adad84
Showing 20 changed files with 108 additions and 91 deletions
src/assets/style/common.scss
src/components/InfoForm/index.vue
src/main.js
src/views/DisposalSuggestions/Form.vue
src/views/baseCaseHandling/Form.vue
src/views/baseCaseHandling/index.vue
src/views/baseComapnyInfo/Form.vue
src/views/baseInspectionReport/Form.vue
src/views/baseInspectionReport/FormPage.vue
src/views/baseListHazardousSamples/Form.vue
src/views/basePrincipalResponsibility/Form.vue
src/views/baseSpecialAction/Form.vue
src/views/baseSpecialAction/dynamicModel/list/Form.vue
src/views/baseSpecialAction/infoForm.vue
src/views/baseSpecialhandle/index.vue
src/views/baseSystemInfo/DetailForm.vue
src/views/baseSystemInfo/HandleInspectForm.vue
src/views/baseSystemInfo/InspectForm.vue
src/views/baseSystemInfo/index.vue
src/views/overView/msgForm.vue
@@ -61,7 +61,6 @@ body,
 a {
  text-decoration: none
-
 } 
 .form-item {
@@ -81,3 +80,11 @@ a {
   }
 }
+.NCC-dialog.NCC-dialog_center {
+  .NCC-dialog-content {
+    padding: 20px 50px 0 !important;
+    margin: 0 !important;
+    width: 100%;
+  }
+}
+
@@ -15,7 +15,8 @@
       class="NCC-dialog NCC-dialog_center dialog-box"
       destroy-on-close
     >
-      <el-form
+      <div class="NCC-dialog-content">
+        <el-form
         :model="infoForm"
         :rules="infoRules"
         ref="infoForm"
@@ -258,7 +259,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
+        </el-form>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="close">取消</el-button>
         <el-button type="primary" @click="confirm" :loading="btnLoading">确认</el-button>
@@ -4,13 +4,14 @@ import App from &#39;./App.vue&#39;
 import router from './router'
 import 'normalize.css/normalize.css'
 import ElementUI from 'element-ui';
-import './styles/element-variables.scss'
-import '@/assets/scss/common.scss'
-import '@/assets/style/common.scss'
 import * as filters from './filters' // global filters
-
+import '@/styles/element-variables.scss'
 import '@/styles/index.scss' // global css
+
+import '@/assets/style/common.scss'
+import '@/assets/scss/common.scss'
 import '@/assets/scss/theme.scss' // 主题
+
 import { message } from './utils/message';
 import 'element-ui/lib/theme-chalk/index.css';
@@ -8,7 +8,7 @@
     width="60%"
     v-loading="loading"
   >
-    <el-row :gutter="15" class="">
+    <el-row :gutter="15" class="NCC-dialog-content">
       <el-col :span="10" style="border-right: 1px solid #e6e6e6">
         <el-row>
           <el-col :span="24" class="form_title"> 巡查上报详情 </el-col>
@@ -8,7 +8,7 @@
     width="50%"
     v-loading="loading"
   >
-    <el-row :gutter="15">
+    <el-row :gutter="15" class="NCC-dialog-content">
       <el-form
         ref="elForm"
         :model="dataForm"
@@ -97,8 +97,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if='formType'>
-          <el-form-item label="执法说明" prop="enforceContent">
-            <el-input type="textarea" v-model="dataForm.enforceContent" placeholder="请输入处罚内容" clearable maxlength="200"/>
+          <el-form-item label="执法说明" prop="enforcecontent">
+            <el-input type="textarea" v-model="dataForm.enforcecontent" placeholder="请输入处罚内容" clearable maxlength="200"/>
           </el-form-item>
         </el-col>
       </el-form>
@@ -149,7 +149,7 @@ export default {
 		    punishmentDecision: undefined,
 		    closingReport: undefined,
         enforceType: undefined,
-        enforceContent: undefined,
+        enforcecontent: undefined,
 	    },
       rules: {
         systemName: [
@@ -161,7 +161,7 @@ export default {
         enforceType: [
           { required: true, message: "请选择执法方式", trigger: "change" }
         ],
-        enforceContent: [
+        enforcecontent: [
           { required: true, message: "请填写执法说明", trigger: "bulr" }
         ],
       },
@@ -242,7 +242,7 @@ export default {
         isReport: type,
       }
 			this.$refs['elForm'].validate((valid) => {
-        if(!type || valid) {
+        if(valid) {
           !this.dataForm.id ? this.toRequest('/Extend/BaseCaseHandling', 'POST', obj) : this.toRequest(`/Extend/BaseCaseHandling/${this.dataForm.id}`, 'PUT', obj);
         }
       })
@@ -251,12 +251,12 @@ export default {
     handle() {
       this.$refs['elForm'].validate((valid) => {
         if(valid) {
-          return
           this.btnLoading = true;
+          let { enforceType, enforcecontent } = this.dataForm;
           request({
-            url: `/Extend/basecasehandling/handling-case`,
-            method: "PUT",
-            data: this.dataForm,
+            url: `/Extend/basecasehandling/HandlingCase/${this.dataForm.id}`,
+            method: "POST",
+            data: { enforceType, enforcecontent },
           }).then((res) => {
             this.$message({
               type: "success",
@@ -103,6 +103,7 @@
               <el-table-column label="操作" fixed="right" width="180">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" @click="addOrUpdateHandle(scope.row.id, true) " >详情</el-button>
+                  <!-- <el-button type="text" v-if="scope.row.state == '592592903172261125'" @click="addOrUpdateHandle(scope.row.id, false, 1)" >处理</el-button> -->
                   <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
                   <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="toReportCase(scope.row.id)" >{{isSHILevel ? '下发' : '上报'}}</el-button>
                   <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
@@ -239,10 +240,10 @@ export default {
         })
         .catch(() => {});
     },
-    addOrUpdateHandle(id, isDetail) {
+    addOrUpdateHandle(id, isDetail, type) {
       this.flowVisible = true;
       this.$nextTick(() => {
-        this.$refs.FlowBox.init(id, isDetail);
+        this.$refs.FlowBox.init(id, isDetail, type);
       });
     },
     toReportCase(id) {
 <template>
 	<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false"
 		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%" v-loading="loading">
-		<el-row :gutter="15" class="">
+		<el-row :gutter="15" class="NCC-dialog-content">
 			<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
 				:disabled="!!isDetail" :rules="rules">
 				<el-col :span="24" v-if="false">
@@ -7,7 +7,7 @@
     lock-scroll
     width="60%"
   >
-    <el-row :gutter="15" class="">
+    <el-row :gutter="15" class="NCC-dialog-content">
       <el-form
         ref="elForm"
         :model="dataForm"
 <template>
 	<div style="width: 100%;height: 100%;background-color: #FFF;padding-top: 10px;">
-		<el-row :gutter="15" class="" >
+		<el-row :gutter="15" class="NCC-dialog-content" >
 				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
 					<el-col :span="24" v-if="false" >
 						<el-form-item label="主键" prop="id">
 <template>
 	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%">
-		<el-row :gutter="15" class="" >
+		<el-row :gutter="15" class="NCC-dialog-content" >
 				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
 					<el-col :span="24">
 						<el-form-item label="主键" prop="id">
 <template>
 	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%">
-		<el-row :gutter="15" class="" >
+		<el-row :gutter="15" class="NCC-dialog-content" >
 				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
 					<el-col :span="24" v-if="false" >
 						<el-form-item label="主键" prop="id">
@@ -8,7 +8,7 @@
     width="50%"
     v-loading="loading"
   >
-    <el-row :gutter="15" style="padding-top: 10px">
+    <el-row :gutter="15" class="NCC-dialog-content">
       <el-form
         ref="elForm"
         :model="dataForm"
 <template>
   <div>
-    <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" :visible.sync="visible"
+    <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false" :visible.sync="visible"
       class="NCC-dialog NCC-dialog_center" lock-scroll :width="formConf.generalWidth">
       <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm" :setFormData="setFormData"
         :setShowOrHide="setShowOrHide" :setRequired="setRequired" :setDisabled="setDisabled"
@@ -13,7 +13,7 @@
           </el-button>
         </template>
         <el-button @click="visible = false">{{ formConf.cancelButtonText || '取 消' }}</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
+        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" v-if="!isDetail">
           {{ formConf.confirmButtonText || '确 定' }}</el-button>
       </span>
     </el-dialog>
@@ -71,6 +71,7 @@ export default {
       printBrowseVisible: false,
       formOperates: [],
       taskId: '',
+      isDetail: false
     }
   },
   methods: {
@@ -81,10 +82,11 @@ export default {
       if (this.isPreview) return this.$message({ message: '功能预览不支持打印', type: 'warning' })
       this.printBrowseVisible = true
     },
-    init(formConf, modelId, id, isPreview, useFormPermission, taskId) {
+    init(formConf, modelId, id, isPreview, useFormPermission, taskId, isDetail) {
       this.formConf = deepClone(JSON.parse(formConf))
       this.modelId = modelId
       this.isPreview = isPreview
+      this.isDetail = isDetail || false
       this.useFormPermission = useFormPermission
       this.dataForm.id = id || ''
       this.taskId = taskId
@@ -100,7 +102,6 @@ export default {
             this.dataForm = res.data
             if (!this.dataForm.data) return
             this.formData = JSON.parse(this.dataForm.data)
-            console.log(  this.formData);
             this.fillFormData(this.formConf, this.formData)
             this.$nextTick(() => {
               this.visible = true
@@ -169,7 +170,6 @@ export default {
       }).catch(() => { this.btnLoading = false })
     },
     async toSaveItemid(itemId) {
-      console.log(11);
       let res = await request({
         url: '/Extend/BaseSpecialActionInfo/UpdateState',
         method: "PUT",
@@ -8,7 +8,7 @@
     lock-scroll
     width="70%"
   >
-    <el-row :gutter="15" style="height: 65vh">
+    <el-row :gutter="15" style="height: 65vh" class="NCC-dialog-content">
         <el-col :span="24" style="margin-bottom: 20px;">
             <el-col :span="12" class="form-item">
                 <div class="label w-100">行动标题：</div>
@@ -47,7 +47,7 @@
               <el-table-column label="操作" fixed="right" width="130">
                 <template slot-scope="scope">
                   <el-button type="text" @click="toFillForm(scope.row)" :disabled="ncc.timeDeadLine(scope.row.deadline) == 'danger' && scope.row.state == '已填写'">{{scope.row.state == '已填写' ? '修改' : '处理'}}</el-button>
-                  <!-- <el-button type="text" @click="toFillForm(scope.row)" v-if="scope.row.state == '已填写'">详情</el-button> -->
+                  <el-button type="text" @click="toFillForm(scope.row, true)" :disabled="scope.row.state != '已填写'">详情</el-button>
                 </template>
               </el-table-column>
             </NCC-table>
@@ -142,7 +142,7 @@ export default {
         this.listLoading = false;
       });
     },
-    toFillForm(row) {
+    toFillForm(row, isDetail) {
       this.dialogVisible = true;
       var  Itemid = row.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
       var  modelId = row.formId;//关联的表单id
@@ -155,8 +155,10 @@ export default {
         method: "GET",
         params:null
       }).then(res => {
-        formData = res.data.formData;
-        this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId)
+        formData = JSON.parse(res.data.formData);
+        formData.disabled = isDetail || false;
+        let form = JSON.stringify(formData);
+        this.$refs.NCCForm.init(form, modelId, Itemid, isPreview, useFormPermission, taskId, isDetail)
       });
       // this.nestedPageUrl = `http://8.130.38.56:8043/old/#/previewModel?isPreview=1&id=${row.originId}`;
@@ -7,7 +7,7 @@
     lock-scroll
     width="40%"
   >
-    <el-row :gutter="15" style="height: 65vh; margin: 10px;" v-loading="loading">
+    <el-row :gutter="15" style="height: 65vh;" class="NCC-dialog-content" v-loading="loading">
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane label="应用信息" name="1">
           <div class="system-info">
@@ -8,53 +8,55 @@
       lock-scroll
       width="70%"
     >
-        <el-form
-          :model="dataForm"
-          :rules="rules"
-          ref="elForm"
-          size="small"
-          label-width="100px"
-          v-loading="loading"
-        >
-          <!-- <el-form-item label="市属" prop="city">
-            <el-input
-              v-model="dataForm.city"
-              placeholder="请输入市属"
-              maxlength="20"
-            ></el-input>
-          </el-form-item> -->
-          <el-form-item label="转入归属地" prop="toChangeIntoId">
-            <el-radio-group
-              v-model="dataForm.toChangeIntoId"
-              placeholder="请选择所属区县"
-              style="line-height: 22px"
-            >
-              <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="内容描述" prop="applnycontent">
-            <el-input
-              type="textarea"
-              v-model="dataForm.applnycontent"
-              placeholder="请输入内容描述"
-              maxlength="300"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="处理意见" prop="processingresults">
-            <el-radio-group v-model="dataForm.processingresults">
-              <el-radio label="同意">同意</el-radio>
-              <el-radio label="不同意">不同意</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="处理意见" prop="opinion">
-            <el-input
-              type="textarea"
-              v-model="dataForm.opinion"
-              placeholder="请输入处理意见"
-              maxlength="300"
-            ></el-input>
-          </el-form-item>
-        </el-form>
+        <div class="NCC-dialog-content">
+          <el-form
+        :model="dataForm"
+        :rules="rules"
+        ref="elForm"
+        size="small"
+        label-width="100px"
+        v-loading="loading"
+      >
+        <!-- <el-form-item label="市属" prop="city">
+          <el-input
+            v-model="dataForm.city"
+            placeholder="请输入市属"
+            maxlength="20"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="转入归属地" prop="toChangeIntoId">
+          <el-radio-group
+            v-model="dataForm.toChangeIntoId"
+            placeholder="请选择所属区县"
+            style="line-height: 22px"
+          >
+            <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="内容描述" prop="applnycontent">
+          <el-input
+            type="textarea"
+            v-model="dataForm.applnycontent"
+            placeholder="请输入内容描述"
+            maxlength="300"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="处理意见" prop="processingresults">
+          <el-radio-group v-model="dataForm.processingresults">
+            <el-radio label="同意">同意</el-radio>
+            <el-radio label="不同意">不同意</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="处理意见" prop="opinion">
+          <el-input
+            type="textarea"
+            v-model="dataForm.opinion"
+            placeholder="请输入处理意见"
+            maxlength="300"
+          ></el-input>
+        </el-form-item>
+          </el-form>
+        </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="visible = false">取 消</el-button>
           <el-button type="primary" @click="dataFormSubmit" :loading="btnLoading">确 定</el-button>
@@ -7,7 +7,7 @@
     lock-scroll
     width="60%"
   >
-    <el-row :gutter="15" class="">
+    <el-row :gutter="15" class="NCC-dialog-content">
       <el-form
         ref="elForm"
         :model="dataForm"
@@ -224,7 +224,7 @@ import { getInfoList } from &quot;@/api/baseData/info&quot;;
 import { applnyChageArea } from "@/api/baseData/info";
 import infoMixin from "@/mixins/info";
 import InspectionForm from "./InspectForm.vue";
-import DetailForm from './DetailForm.vue'
+import DetailForm from './DetailForm.vue';
 import ChangeRecord from "./ChangeRecord.vue";
 export default {
@@ -7,8 +7,9 @@
     lock-scroll
     width="50%"
   >
-    <div style="padding-top: 10px" v-if="!isDetail">
-      <el-form
+    <div class="NCC-dialog-content">
+      <div style="padding-top: 10px" v-if="!isDetail">
+        <el-form
         ref="elForm"
         :model="dataForm"
         size="small"
@@ -78,9 +79,9 @@
             </div>
           </el-form-item>
         </el-col>
-      </el-form>
-    </div>
-    <div
+        </el-form>
+      </div>
+      <div
       style="padding-top: 10px"
       class="msg-box"
       v-loading="loading"
@@ -111,6 +112,7 @@
           </el-tag>
         </div>
       </div>
+      </div>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>