From 95af123562c0a05ae8955d53fcdcd4c8b310ced8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 29 六月 2022 17:32:00 +0800
Subject: [PATCH] 1.制造模型：工艺路线(新增、删除、预览)功能开发 2.制造模型：工序定义(查询) 功能开发 3.系统设置：编码规则(查询)功能开发4.修改实施部提出的bug

---
 src/views/zzmx/gxdy.vue |  591 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 588 insertions(+), 3 deletions(-)

diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index af17901..d377590 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -1,11 +1,596 @@
-<template />
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+      <div style="padding: 10px 5px 0 0">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="80px"
+          inline
+          style="display: flex;justify-content: space-between"
+        >
+          <div class="elForm">
+            <el-form-item label="宸ュ簭缂栫爜" style=" display: flex;">
+              <el-input v-model="form.stepcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="宸ュ簭鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="鍚敤鐘舵��" style=" display: flex;">
+              <el-select v-model="form.enable" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in enableArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="宸ュ簭绫诲瀷" style=" display: flex;">
+              <el-select
+                v-model="form.steptypecode"
+                :popper-append-to-body="false"
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in steptypeArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+              <el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+          </div>
+          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+            <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>
+      <el-divider />
+      <div style="margin-left: 10px;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" @click="upload">瀵煎叆</el-button>
+      </div>
+      <el-divider />
+      <div class="elTableDiv">
+        <el-table
+          :data="tableData"
+          :height="tableHeight"
+          border
+          stripe
+          :style="{width: 100+'%',height:tableHeight+'px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          @sort-change="sortChange"
+        >
+          <!--          <el-table-column-->
+          <!--            type="selection"-->
+          <!--            width="50"-->
+          <!--          />-->
+          <el-table-column
+            prop="RowNum"
+            width="50"
+            label="搴忓彿"
+          />
+          <el-table-column
+            prop="stepcode"
+            label="宸ュ簭缂栫爜"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="stepname"
+            label="宸ュ簭鍚嶇О"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="flwtype"
+            label="宸ュ簭绫诲瀷"
+            sortable="custom"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.flwtype.indexOf(';')!==-1">鑷埗;澶栧崗</div>
+              <div v-if="row.flwtype==='W'">澶栧崗</div>
+              <div v-if="row.flwtype==='Z'">鑷埗</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="descr"
+            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">
+                <i class="el-icon-share" @click="workClick(row)" />
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鍏宠仈缂洪櫡"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <i class="el-icon-share" @click="defectClick(row)" />
+              </div>
+            </template>
+          </el-table-column>
+          <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)">鍒犻櫎</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="getStepSearch"
+      />
+    </div>
+
+    <el-dialog
+      :title="operation==='add'?'鏂板':'淇敼'"
+      :visible.sync="dialogVisible"
+      width="50%"
+      :close-on-click-modal="false"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+        <el-form-item label="宸ュ簭缂栫爜" prop="stepcode">
+          <el-input v-model="dialogForm.stepcode" :disabled="operation!=='add'" style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="宸ュ簭鍚嶇О" prop="stepname">
+          <el-input v-model="dialogForm.stepname" style="width: 220px" />
+        </el-form-item>
+        <el-form-item prop="steptypecode" label="宸ュ簭绫诲瀷">
+          <el-select
+            v-model="dialogForm.steptypecode"
+            style="width: 220px"
+            placeholder="璇烽�夋嫨"
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in steptypeArr"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="enable" label="鍚敤鐘舵��">
+          <el-select
+            v-model="dialogForm.enable"
+            style="width: 220px"
+            placeholder="璇烽�夋嫨"
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in enableArr"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="宸ュ簭鎻忚堪" prop="description">
+          <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
+        </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'
+import { AddUpdateStep, DeleteStep, StepSearch } from '@/api/zzmx'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: 'Gxdy'
+  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()
+        }
+      }
+    }
+    return {
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        stepcode: '', // 宸ュ簭缂栫爜
+        stepname: '', // 宸ュ簭鍚嶇О
+        enable: '', // 鍚敤鐘舵��
+        steptypecode: [], // 宸ュ簭绫诲瀷缂栫爜
+        createuser: '', // 鍒涘缓浜哄憳
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      enableArr: [
+        { code: 'Y', name: '鏄�' },
+        { code: 'N', name: '鍚�' }
+      ],
+      steptypeArr: [
+        { code: 'Z', name: '鑷埗' },
+        { code: 'W', name: '澶栧崗' },
+        { code: 'Z;W', name: '鑷埗锛涘鍗�' }
+      ],
+      total: 10,
+      tableData: [],
+      dialogVisible: false,
+      dialogForm: {
+        'idid': '',
+        'stepcode': '',
+        'stepname': '',
+        'steptypecode': '',
+        'enable': '',
+        'description': '',
+        'OperType': ''
+      },
+      operation: '',
+      dialogFormRules: {
+        stepcode: [
+          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+        ],
+        stepname: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ],
+        steptypecode: [
+          { required: true, message: '璇烽�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+        ],
+        enable: [
+          { required: true, message: '璇烽�夋嫨鐘舵��', trigger: ['blur', 'change'] }
+        ]
+
+      }
+
+    }
+  },
+  created() {
+    this.getStepSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    async getStepSearch() {
+      const res = await StepSearch(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.getStepSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getStepSearch()
+    },
+    upload() {
+
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.stepcode = ''
+      this.form.stepname = ''
+      this.form.enable = ''
+      this.form.steptypecode = ''
+      this.form.createuser = ''
+      this.getStepSearch()
+    },
+
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      this.$nextTick(() => {
+        this.dialogForm.id = row.id
+        this.dialogForm.stepcode = row.stepcode
+        this.dialogForm.stepname = row.stepname
+        this.dialogForm.steptypecode = row.flwtype
+        this.dialogForm.description = row.descr
+        this.dialogForm.enable = row.enable
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteStep({ stepcode: row.stepcode }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            this.getStepSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.stepcode = ''
+      this.dialogForm.stepname = ''
+      this.dialogForm.steptypecode = ''
+      this.dialogForm.enable = ''
+      this.dialogForm.description = ''
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          const data = {
+            id: this.dialogForm.id,
+            stepcode: this.dialogForm.stepcode,
+            stepname: this.dialogForm.stepname,
+            steptypecode: this.dialogForm.steptypecode,
+            enable: this.dialogForm.enable,
+            description: this.dialogForm.description,
+            OperType: this.operation === 'add' ? 'Add' : 'Update'
+          }
+          AddUpdateStep(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+              this.getStepSearch()
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 250
+        this.tableHeight = this.mainHeight - 100
+      })
+    },
+    /* 鍏宠仈宸ヤ綔绔欐ā鍧�*/
+    // 鍏宠仈宸ヤ綔绔欑偣鍑�
+    workClick(row) {
+
+    },
+
+    /* 鍏宠仈缂洪櫡*/
+    //  鍏宠仈缂洪櫡鐐瑰嚮
+    defectClick(row) {
+
+    }
+  }
 }
 </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;
+  //border: 1px solid $main_color;
+  border: none;
+  padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+  border: none;
+}
+::v-deep .el-button--info {
+  height: 30px;
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.footerButton {
+  display: flex;
+  justify-content: end;
+}
+
+::v-deep .el-button--default {
+  background-color: #ffffff !important;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+}
+
+::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;
+  line-height: 30px;
+}
+::v-deep .el-input__inner:focus {
+  border-color: $main_color;
+}
+
+::v-deep .el-table .caret-wrapper {
+  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;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+  border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+  border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+  color: $main_color;
+}
+::v-deep .el-checkbox__inner:hover{
+  border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+  border-color: $main_color;
+}
 
 </style>

--
Gitblit v1.9.3