From 206ec855ef1853430275f6a375142ec7789cc532 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 21 六月 2022 16:54:20 +0800
Subject: [PATCH] 1.优化代码，新增产品部署时不输出console

---
 babel.config.js         |   35 ++-
 src/views/jcsz/wldw.vue |  512 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/jcsz/jsqd.vue |   26 +
 package.json            |    1 
 4 files changed, 553 insertions(+), 21 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index fb82b27..691ee39 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,14 +1,29 @@
+// module.exports = {
+//   presets: [
+//     // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
+//     '@vue/cli-plugin-babel/preset'
+//   ],
+//   'env': {
+//     'development': {
+//       // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
+//       // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
+//       // https://panjiachen.github.io/vue-element-admin-site/guide/advanced/lazy-loading.html
+//       'plugins': ['dynamic-import-node']
+//     }
+//   }
+// }
+
+const proPlugins = []
+// 濡傛灉鏄敓浜х幆澧冿紝鍒欎娇鐢ㄥ幓鎺塩onsole鐨勬彃浠�
+if (process.env.NODE_ENV === 'production') {
+  proPlugins.push('transform-remove-console', 'dynamic-import-node')
+}
+
 module.exports = {
   presets: [
-    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
-    '@vue/cli-plugin-babel/preset'
+    '@vue/app'
   ],
-  'env': {
-    'development': {
-      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
-      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
-      // https://panjiachen.github.io/vue-element-admin-site/guide/advanced/lazy-loading.html
-      'plugins': ['dynamic-import-node']
-    }
-  }
+  plugins: [
+    ...proPlugins
+  ]
 }
diff --git a/package.json b/package.json
index 233fc16..196407a 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "babel-eslint": "10.1.0",
     "babel-jest": "23.6.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
+    "babel-plugin-transform-remove-console": "^6.9.4",
     "chalk": "2.4.2",
     "connect": "3.6.6",
     "eslint": "6.7.2",
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 4580a21..b00a1d0 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -975,7 +975,7 @@
           this.$nextTick(() => {
             $('input:checkbox').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
           })
-        }, 1)
+        }, 10)
         this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
       }
       // 3.绗笁绉嶆儏鍐礟C鏈�変腑锛孉PP宸查�変腑
@@ -986,7 +986,7 @@
           this.$nextTick(() => {
             $('input:checkbox').eq(1).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
           })
-        }, 1)
+        }, 10)
         this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
       }
       // 4.绗洓绉嶆儏鍐礟C宸查�変腑锛孉PP宸查�変腑
@@ -1000,7 +1000,7 @@
             $('input:checkbox').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
             $('input:checkbox').eq(1).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
           })
-        }, 1)
+        }, 10)
         this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
       }
       this.dialogFormRight.rightOperationArr.push({
@@ -1043,8 +1043,12 @@
         }
       })
       this.$nextTick(() => {
-        this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
-        this.$refs.rightAPPRef.setCheckedKeys(this.dialogFormRight.rightAPPArrSelected)
+        if (this.$refs.rightPCRef) {
+          this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
+        }
+        if (this.$refs.rightAPPRef) {
+          this.$refs.rightAPPRef.setCheckedKeys(this.dialogFormRight.rightAPPArrSelected)
+        }
       })
     },
     // 鍒嗛厤鏉冮檺鍏抽棴浜嬩欢
@@ -1054,8 +1058,12 @@
       this.dialogFormRight.rightAPPArr = []
       this.dialogFormRight.rightAPPArrSelected = []
       this.dialogFormRight.rightOperationArr = []
-      this.$refs.rightPCRef.setCheckedKeys([])
-      this.$refs.rightAPPRef.setCheckedKeys([])
+      if (this.$refs.rightPCRef) {
+        this.$refs.rightPCRef.setCheckedKeys([])
+      }
+      if (this.$refs.rightAPPRef) {
+        this.$refs.rightAPPRef.setCheckedKeys([])
+      }
     },
     // 鏉冮檺瀵硅瘽妗嗗彇娑堜簨浠�
     rightDialogVisibleCancel() {
@@ -1071,7 +1079,7 @@
           const children = []
           let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
           item.children.forEach(it => {
-            if (this.dialogFormRight.rightPCArrSelected.includes(it.code)) {
+            if (this.dialogFormRight.rightPCArrSelected.includes(it.code) || this.dialogFormRight.rightPCArrSelected.includes('PC')) {
               flag = true
               children.push(
                 { code: it.code, name: it.name, flag: 'Y' }
@@ -1090,7 +1098,7 @@
           const children = []
           let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
           item.children.forEach(it => {
-            if (this.dialogFormRight.rightAPPArrSelected.includes(it.code)) {
+            if (this.dialogFormRight.rightAPPArrSelected.includes(it.code) || this.dialogFormRight.rightAPPArrSelected.includes('APP')) {
               flag = true
               children.push(
                 { code: it.code, name: it.name, flag: 'Y' }
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 63380ba..8f58012 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -1,13 +1,521 @@
 <template>
+  <div>
+    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
+      <div style="height: 50px;">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="80px"
+          inline
+          style="display: flex;justify-content: space-between"
+        >
+          <div style="display: flex;justify-content: space-around;width: 85%">
+            <el-form-item label="鍗曚綅缂栫爜" style=" display: flex;">
+              <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+            </el-form-item>
+            <el-form-item label="鍗曚綅鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+            </el-form-item>
+            <el-form-item label="鍗曚綅灞炴��" style=" display: flex;">
+              <el-select v-model="form.OrgType" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in OrgTypeArr"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+              <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+          </div>
+          <div style="display: flex;align-items: start;margin-top: 5px;">
+            <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+      </div>
+      <div style="margin-bottom: 20px;display: flex">
+        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+        <el-button type="primary" icon="el-icon-upload2">瀵煎叆</el-button>
+      </div>
 
+      <div style="display: flex;border: 1px solid #eee">
+        <el-table
+          :data="tableData"
+          border
+          highlight-current-row
+          :style="{width: 100+'%',height:tableHeight+'px'}"
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          @sort-change="sortChange"
+        >
+          <!--          <el-table-column-->
+          <!--            type="selection"-->
+          <!--            width="50"-->
+          <!--          />-->
+          <el-table-column
+            prop="id"
+            width="50"
+            label="搴忓彿"
+          />
+          <el-table-column
+            prop="org_code"
+            label="缁勭粐缂栫爜"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="org_name"
+            label="缁勭粐鍚嶇О"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="description"
+            label="缁勭粐绫诲瀷"
+            sortable="custom"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.description==='F'">宸ュ巶</div>
+              <div v-if="row.description==='D'">閮ㄩ棬</div>
+              <div v-if="row.description==='W'">杞﹂棿</div>
+              <div v-if="row.description==='K'">绉戝</div>
+              <div v-if="row.description==='L'">鐢熶骇绾�</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="parentorg_name"
+            label="涓婄骇鍗曚綅"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="lm_user"
+            label="鍒涘缓浜哄憳"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="lm_date"
+            label="鍒涘缓鏃堕棿"
+            sortable="custom"
+          />
+          <el-table-column
+            label="鎿嶄綔"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="prev, pager, next,sizes"
+        popper-class="select_bottom"
+        @pagination="getOrganizationSearch"
+      />
+    </div>
+
+    <el-dialog
+      :title="operation==='add'?'娣诲姞':'淇敼'"
+      :visible.sync="dialogVisible"
+      width="50%"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+        <el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
+          <el-radio-group
+            v-model="dialogForm.OrgType"
+            style="display: flex;align-items: end;height: 29px;"
+            @change="changeRadio"
+          >
+            <el-radio
+              v-for="item in OrgTypeArr"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
+          <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+        </el-form-item>
+        <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
+          <el-select
+            v-model="dialogForm.SupUnit"
+            style="width: 220px"
+            placeholder="璇烽�夋嫨"
+          >
+            <el-option
+              v-for="item in SupUnitArr"
+              :label="item.org_name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: "wldw"
+  name: 'Zzjg',
+  components: {
+    Pagination
+  },
+  data() {
+    const validateName = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+      } else {
+        if (SER_HZ.test(value)) {
+          return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+        } else {
+          callback()
+        }
+      }
+    }
+    const validateTypeCode = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇烽�夋嫨涓婄骇'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        CuntUnitCode: '', // 寰�鏉ュ崟浣嶇紪鐮�
+        CuntUnitName: '', // 寰�鏉ュ崟浣嶅悕绉�
+        UnitAttr: '', // 鍗曚綅灞炴��
+        CreateUser: '', // 鍒涘缓浜哄憳
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 10 // 姣忛〉澶氬皯鏉�
+      },
+      OrgTypeArr: [
+        { label: '宸ュ巶', value: 'F' },
+        { label: '閮ㄩ棬', value: 'D' },
+        { label: '杞﹂棿', value: 'W' },
+        { label: '绉戝', value: 'K' },
+        { label: '鐢熶骇绾�', value: 'L' }
+      ],
+
+      total: 10,
+      tableData: [],
+      dialogVisible: false,
+      dialogForm: {
+        OrgType: '',
+        OrgCode: '',
+        OrgName: '',
+        SupUnit: ''// 涓婄骇鍗曚綅
+      },
+      SupUnitArr: [],
+      dialogFormOrgTypeSelected: '',
+      operation: '',
+      dialogFormRules: {
+        OrgType: [
+          { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+        ],
+        OrgCode: [
+          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+        ],
+        OrgName: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ],
+        SupUnit: [
+          { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+        ]
+      }
+
+    }
+  },
+  created() {
+    this.getOrganizationSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    async getOrganizationSearch() {
+      const res = await OrganizationSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getOrganizationSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getOrganizationSearch()
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.OrgCode = ''
+      this.form.OrgName = ''
+      this.form.OrgType = ''
+      this.form.UserName = ''
+      this.getOrganizationSearch()
+    },
+    // 鍗曢�夋鏀瑰彉鏃�
+    async changeRadio(val) {
+      if (val.length > 1) {
+        this.OrgTypeArr.forEach(item => {
+          if (item.label === val) {
+            this.dialogFormOrgTypeSelected = item.value
+          }
+        })
+        this.dialogForm.SupUnit = ''
+      } else {
+        this.dialogFormOrgTypeSelected = val
+      }
+      if (this.dialogFormOrgTypeSelected !== 'F') {
+        const { data: res } = await PrentOrganization({ orgcode: this.dialogFormOrgTypeSelected })
+        this.SupUnitArr = res
+      }
+    },
+
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+      if (row.description === 'F') {
+        this.dialogForm.OrgType = '宸ュ巶'
+      } else if (row.description === 'D') {
+        this.dialogForm.OrgType = '閮ㄩ棬'
+      } else if (row.description === 'W') {
+        this.dialogForm.OrgType = '杞﹂棿'
+      } else if (row.description === 'K') {
+        this.dialogForm.OrgType = '绉戝'
+      } else if (row.description === 'L') {
+        this.dialogForm.OrgType = '鐢熶骇绾�'
+      }
+      this.$nextTick(() => {
+        this.changeRadio(this.dialogForm.OrgType)
+        this.dialogForm.OrgCode = row.org_code
+        this.dialogForm.OrgName = row.org_name
+        this.dialogForm.SupUnit = row.parent_id
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(id) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteOrganization({ orgid: id }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            this.getOrganizationSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.OrgType = ''
+      this.dialogForm.OrgCode = ''
+      this.dialogForm.OrgName = ''
+      this.dialogForm.SupUnit = ''
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          const data = {
+            OrganType: this.dialogFormOrgTypeSelected,
+            OrganCode: this.dialogForm.OrgCode,
+            OrganName: this.dialogForm.OrgName,
+            SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+          AddUpdateOrganization(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.getOrganizationSearch()
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+
+          this.dialogVisible = false
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 200
+        this.tableHeight = this.mainHeight - 100
+      })
+    }
+  }
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+  background-color: $main_color !important;
+  height: 30px;
+  display: flex;
+  align-items: center;
+}
 
+::v-deep .el-button--info {
+  //background-color: $main_color !important;
+  height: 30px;
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: $main_color !important;
+}
+
+.footerButton {
+  display: flex;
+  justify-content: end;
+}
+
+::v-deep .el-button--default {
+  background-color: #ffffff !important;
+  height: 30px;
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .el-button--default:hover {
+  color: #606266;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+  background-color: $main_color;
+  border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+  color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+  border-color: $main_color;
+  background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+  height: 30px
+}
+
+::v-deep .el-table .caret-wrapper {
+  //float: right;
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+  color: $main_color;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.operationClass {
+  height: 23px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.el-icon-share {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+  border-color: $main_color;
+}
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+  border-color: $main_color;
+  background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+  border-color: $main_color;
+  background: $main_color;
+}
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+  color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
+  margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+  color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+  margin: 10px 30px 0px 0;
+}
 </style>

--
Gitblit v1.9.3