修改

11 months ago · 101d9f9fd5
14 changed files with 70 additions and 44 deletions
--- a/src/views/dike/managementGuarantee/archivesManagement/index.vue
+++ b/src/views/dike/managementGuarantee/archivesManagement/index.vue
@ -246,11 +246,8 @@
          </el-select> -->
        </el-form-item>
        <el-form-item label="堤防调度规程" prop="regulationsAttachment">
-          <!-- <el-input
-            v-model="form.regulationsAttachment"
-            placeholder="请输入堤防调度规程"
-          /> -->
-          <el-upload
+          <myUpload :fileList="fileList1" />
+          <!-- <el-upload
            class="upload-demo"
            action="thinking/common/upload"
            :headers="headers"
@ -269,14 +266,11 @@
            <div slot="tip" class="el-upload__tip">
              支持jpg/png文件等，不超过100M
            </div>
-          </el-upload>
+          </el-upload> -->
        </el-form-item>
        <el-form-item label="年度调度运用计划" prop="planAttachment">
-          <!-- <el-input
-            v-model="form.planAttachment"
-            placeholder="请输入年度调度运用计划"
-          /> -->
-          <el-upload
+          <myUpload :fileList="fileLis2" />
+          <!-- <el-upload
            class="upload-demo"
            action="thinking/common/upload"
            :headers="headers"
@ -295,7 +289,7 @@
            <div slot="tip" class="el-upload__tip">
              支持jpg/png文件等，不超过100M
            </div>
-          </el-upload>
+          </el-upload> -->
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
--- a/src/views/dike/managementGuarantee/fundGuarantee/components/maintenanceFund.vue
+++ b/src/views/dike/managementGuarantee/fundGuarantee/components/maintenanceFund.vue
@ -142,6 +142,9 @@ export default {
      form: {},
      // 表单校验
      rules: {
+        unitName: [
+          { required: true, message: "请输入单位名称", trigger: "blur" },
+        ],
        peopleNum: [
          {
            pattern: /^[1-9]\d*$/,
@ -150,6 +153,7 @@ export default {
          },
        ],
        funds: [
+          { required: true, message: "请输入经费", trigger: "blur" },
          {
            pattern:
              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
--- a/src/views/dike/managementGuarantee/fundGuarantee/components/personnelExpenses.vue
+++ b/src/views/dike/managementGuarantee/fundGuarantee/components/personnelExpenses.vue
@ -142,6 +142,9 @@ export default {
      form: {},
      // 表单校验
      rules: {
+        unitName: [
+          { required: true, message: "请输入单位名称", trigger: "blur" },
+        ],
        peopleNum: [
          {
            pattern: /^[1-9]\d*$/,
@ -150,6 +153,7 @@ export default {
          },
        ],
        funds: [
+          { required: true, message: "请输入经费", trigger: "blur" },
          {
            pattern:
              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
--- a/src/views/dike/managementGuarantee/fundGuarantee/index.vue
+++ b/src/views/dike/managementGuarantee/fundGuarantee/index.vue
@ -85,6 +85,17 @@
    </el-form>

    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['df:jfgl:remove']"
+          >删除</el-button
+        >
+      </el-col>
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
--- a/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
@ -659,7 +659,11 @@ export default {
      // 表单参数
      form: {},
      // 表单校验
-      rules: {},
+      rules: {
+        dikeCode: [
+          { required: true, message: "请选择堤防名称", trigger: "change" },
+        ],
+      },
      // 请求头
      headers: {
        shuili: "water " + getToken(),
--- a/src/views/dike/safetyManage/floodControlManagement/tissue.vue
+++ b/src/views/dike/safetyManage/floodControlManagement/tissue.vue
@ -53,7 +53,7 @@
        >
        </el-cascader>
      </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
        label="负责人职务"
        prop="chargePersonDuites"
        label-width="84px"
@ -65,7 +65,7 @@
          size="small"
          @keyup.enter.native="handleQuery"
        />
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item>
        <!-- <el-button
          type="cyan"
--- a/src/views/dike/safetyManage/safeProduction/components/list.vue
+++ b/src/views/dike/safetyManage/safeProduction/components/list.vue
@ -303,12 +303,8 @@
        </el-form-item>

        <el-form-item label="图片" prop="photo">
-          <!-- <el-input
-            v-model="form.photo"
-            type="textarea"
-            placeholder="请输入内容"
-          /> -->
-          <el-upload
+          <myUpload :fileList="fileList" />
+          <!-- <el-upload
            class="upload-demo"
            action="thinking/common/upload"
            :headers="headers"
@ -327,7 +323,7 @@
            <div slot="tip" class="el-upload__tip">
              支持jpg/png文件等，不超过100M
            </div>
-          </el-upload>
+          </el-upload> -->
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
--- a/src/views/sluice/managementGuarantee/archivesManagement/index.vue
+++ b/src/views/sluice/managementGuarantee/archivesManagement/index.vue
@ -246,11 +246,8 @@
          </el-select> -->
        </el-form-item>
        <el-form-item label="水闸调度规程" prop="regulationsAttachment">
-          <!-- <el-input
-            v-model="form.regulationsAttachment"
-            placeholder="请输入水闸调度规程"
-          /> -->
-          <el-upload
+          <myUpload :fileList="fileList1" />
+          <!-- <el-upload
            class="upload-demo"
            action="thinking/common/upload"
            :headers="headers"
@ -269,14 +266,11 @@
            <div slot="tip" class="el-upload__tip">
              支持jpg/png文件等，不超过100M
            </div>
-          </el-upload>
+          </el-upload> -->
        </el-form-item>
        <el-form-item label="年度调度运用计划" prop="planAttachment">
-          <!-- <el-input
-            v-model="form.planAttachment"
-            placeholder="请输入年度调度运用计划"
-          /> -->
-          <el-upload
+          <myUpload :fileList="fileList2" />
+          <!-- <el-upload
            class="upload-demo"
            action="thinking/common/upload"
            :headers="headers"
@ -295,7 +289,7 @@
            <div slot="tip" class="el-upload__tip">
              支持jpg/png文件等，不超过100M
            </div>
-          </el-upload>
+          </el-upload> -->
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
--- a/src/views/sluice/managementGuarantee/fundGuarantee/components/maintenanceFund.vue
+++ b/src/views/sluice/managementGuarantee/fundGuarantee/components/maintenanceFund.vue
@ -142,6 +142,9 @@ export default {
      form: {},
      // 表单校验
      rules: {
+        unitName: [
+          { required: true, message: "请输入单位名称", trigger: "blur" },
+        ],
        peopleNum: [
          {
            pattern: /^[1-9]\d*$/,
@ -150,6 +153,7 @@ export default {
          },
        ],
        funds: [
+          { required: true, message: "请输入经费", trigger: "blur" },
          {
            pattern:
              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
--- a/src/views/sluice/managementGuarantee/fundGuarantee/components/personnelExpenses.vue
+++ b/src/views/sluice/managementGuarantee/fundGuarantee/components/personnelExpenses.vue
@ -142,6 +142,9 @@ export default {
      form: {},
      // 表单校验
      rules: {
+        unitName: [
+          { required: true, message: "请输入单位名称", trigger: "blur" },
+        ],
        peopleNum: [
          {
            pattern: /^[1-9]\d*$/,
@ -150,6 +153,7 @@ export default {
          },
        ],
        funds: [
+          { required: true, message: "请输入经费", trigger: "blur" },
          {
            pattern:
              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
--- a/src/views/sluice/managementGuarantee/fundGuarantee/index.vue
+++ b/src/views/sluice/managementGuarantee/fundGuarantee/index.vue
@ -84,6 +84,17 @@
    </el-form>

    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['sz:jfgl:remove']"
+          >删除</el-button
+        >
+      </el-col>
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
--- a/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
+++ b/src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
@ -659,7 +659,11 @@ export default {
      // 表单参数
      form: {},
      // 表单校验
-      rules: {},
+      rules: {
+        wagaCode: [
+          { required: true, message: "请选择水闸名称", trigger: "change" },
+        ],
+      },
      // 请求头
      headers: {
        shuili: "water " + getToken(),
--- a/src/views/sluice/safetyManage/floodControlManagement/tissue.vue
+++ b/src/views/sluice/safetyManage/floodControlManagement/tissue.vue
@ -53,7 +53,7 @@
        >
        </el-cascader>
      </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
        label="负责人职务"
        prop="chargePersonDuites"
        label-width="84px"
@ -65,7 +65,7 @@
          size="small"
          @keyup.enter.native="handleQuery"
        />
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item>
        <!-- <el-button
          type="cyan"
--- a/src/views/sluice/safetyManage/safeProduction/components/list.vue
+++ b/src/views/sluice/safetyManage/safeProduction/components/list.vue
@ -298,12 +298,8 @@
        </el-form-item>

        <el-form-item label="图片" prop="photo">
-          <!-- <el-input
-            v-model="form.photo"
-            type="textarea"
-            placeholder="请输入内容"
-          /> -->
-          <el-upload
+          <myUpload :fileList="fileList" />
+          <!-- <el-upload
            class="upload-demo"
            action="thinking/common/upload"
            :headers="headers"
@ -322,7 +318,7 @@
            <div slot="tip" class="el-upload__tip">
              支持jpg/png文件等，不超过100M
            </div>
-          </el-upload>
+          </el-upload> -->
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">