From 33d9266f5b3f72b518b17645a4d04921eea49651 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 02 七月 2022 11:38:36 +0800
Subject: [PATCH] 1.修改bug

---
 src/views/jcsz/zzjg.vue |    4 
 src/views/zzmx/chda.vue |    4 
 src/views/scgl/scdd.vue |  216 ++++++++++---
 src/views/jcsz/wldw.vue |    4 
 src/views/scgl/gd.vue   |  638 +++++++++++++++++++++++++++++++++++++++
 src/views/zzmx/gylx.vue |    2 
 src/views/sbgl/sbqd.vue |    4 
 src/views/template.vue  |    4 
 src/views/jcsz/yhqd.vue |    6 
 src/views/template2.vue |    4 
 src/views/zzmx/jpgj.vue |   12 
 src/views/jcsz/jsqd.vue |    4 
 src/views/wlgl/ckdy.vue |    4 
 src/views/xtsz/bmgz.vue |    2 
 src/views/zzmx/gxdy.vue |    4 
 src/views/wlgl/kwdy.vue |    4 
 src/views/zzmx/wllx.vue |    4 
 17 files changed, 830 insertions(+), 90 deletions(-)

diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index a6ff328..86c71e8 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -128,7 +128,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -150,7 +150,7 @@
 
     <!--    鏂板淇敼瀵硅瘽妗�-->
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       top="15vh"
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 5b6d67f..cb86979 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -141,7 +141,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -162,7 +162,7 @@
     </div>
 
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       top="15vh"
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 9a79653..cb6c016 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -156,7 +156,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -176,9 +176,9 @@
       />
     </div>
 
-    <!--    鐢ㄦ埛娓呭崟鏂板銆佷慨鏀�-->
+    <!--    鐢ㄦ埛娓呭崟鏂板銆佺紪杈�-->
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       :close-on-click-modal="false"
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 8168337..140fd2a 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -107,7 +107,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -128,7 +128,7 @@
     </div>
 
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       top="15vh"
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 5532429..8da75f8 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -176,7 +176,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -198,7 +198,7 @@
     <!--璁惧娓呭崟鏂板缂栬緫-->
     <el-dialog
       :close-on-click-modal="false"
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       top="15vh"
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index b1eb136..949608a 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -1,11 +1,643 @@
-<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-select
+                v-model="form.erporderstus"
+                :popper-append-to-body="false"
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in erporderstusArr"
+                  :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.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+
+            <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+              <el-select v-model="form.partcode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in OrgTypeArr"
+                  :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.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+            <el-form-item label="浜у搧瑙勬牸" style=" display: flex;">
+              <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+            <el-form-item label="浜や粯鏃堕棿" style=" display: flex;">
+              <el-date-picker
+                v-model="form.paydate"
+                type="date"
+                style="width: 200px"
+                placeholder="閫夋嫨鏃ユ湡"
+              />
+            </el-form-item>
+            <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+              <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+            <el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
+              <el-date-picker
+                v-model="form.createdate"
+                type="date"
+                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-refresh-right"
+        >鍚屾ERP
+        </el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-switch-button"
+        >璁㈠崟鍏抽棴
+        </el-button>
+        <!--        <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
+            width="50"
+          >
+            <template scope="scope">
+              <el-radio
+                v-model="radioSelected"
+                style="color: #fff;padding-left: 10px; margin-right: -25px;"
+                @change.native="getCurrentRow(scope.row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="RowNum"
+            width="50"
+            label="搴忓彿"
+          />
+          <el-table-column
+            prop="status"
+            label="璁㈠崟鐘舵��"
+            sortable="custom"
+            width="110"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.status==='CREATING'">杩涜涓�</div>
+              <div v-if="row.status==='NEW'">鏈紑濮�</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="wo_code"
+            label="宸ュ崟缂栧彿"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="partcode"
+            label="浜у搧缂栫爜"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="partname"
+            label="浜у搧鍚嶇О"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="partspec"
+            label="浜у搧瑙勬牸"
+            sortable="custom"
+            width="110"
+          />
+          <el-table-column
+            prop="plan_qty"
+            label="宸ユ暟閲�"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="plan_qty"
+            label="鐢熶骇杞﹂棿"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="wkshp_name"
+            label="宸ヨ壓璺嚎"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="route_name"
+            label="鐢熶骇杞﹂棿"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="paydate"
+            label="瑕佹眰浜や粯鏃堕棿"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="createuser"
+            label="鍒涘缓浜哄憳"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="createdate"
+            label="鍒涘缓鏃堕棿"
+            show-overflow-tooltip
+            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)">鍒犻櫎</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="getMesOrderSearch"
+      />
+    </div>
+
+    <el-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="50%"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+        <el-form-item label="璁㈠崟鐘舵��" prop="OrgCode">
+          <el-select
+            v-model="form.partcode"
+            disabled
+            :popper-append-to-body="false"
+            style="width: 220px"
+            placeholder="璇烽�夋嫨"
+          >
+            <el-option
+              v-for="item in OrgTypeArr"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="璁㈠崟缂栧彿" prop="OrgCode">
+          <el-input v-model="dialogForm.OrgCode" disabled style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="浜у搧缂栫爜" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="浜у搧鍚嶇О" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="璁㈠崟鏁伴噺" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="浜у搧瑙勬牸" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" disabled 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 label="涓嬪崟鏁伴噺" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="浜や粯鏃堕棿" prop="OrgName">
+          <el-date-picker
+            v-model="dialogForm.OrgName"
+            type="date"
+            style="width: 220px"
+            placeholder="閫夋嫨鏃ユ湡"
+          />
+          <!--          <el-input v-model="dialogForm.OrgName" 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 { ErpOrderSearch, MesOrderSearch } from '@/api/scgl'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: 'Gd'
+  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: {
+        mesorderstus: '', // 宸ュ崟鐘舵�佺爜
+        mesordercode: '', // 宸ュ崟缂栧彿
+        partcode: '', // 浜у搧缂栫爜
+        partname: '', // 浜у搧鍚嶇О
+        partspec: '', // 浜у搧瑙勬牸
+        creatuser: '', // 鍒涘缓浜哄憳
+        createdate: '', // 鍒涘缓鏃堕棿
+        prop: 'partcode', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      erporderstusArr: [
+        { code: 'CREATING', name: '杩涜涓�' },
+        { code: 'NEW', name: '鏈紑濮�' }
+      ],
+      total: 10,
+      radioSelected: '',
+      tableData: [],
+      dialogVisible: false,
+      dialogForm: {
+        OrgType: '',
+        OrgCode: '',
+        OrgName: '',
+        SupUnit: ''// 涓婄骇鍗曚綅
+      },
+      operation: '',
+      dialogFormRules: {
+        OrgType: [
+          { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+        ],
+        OrgCode: [
+          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+        ],
+        OrgName: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ]
+
+      }
+
+    }
+  },
+  created() {
+    this.getMesOrderSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    async getMesOrderSearch() {
+      const res = await MesOrderSearch(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.getMesOrderSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getMesOrderSearch()
+    },
+    upload() {
+
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.erporderstus = ''
+      this.form.erpordercode = ''
+      this.form.partcode = ''
+      this.form.partname = ''
+      this.form.partspec = ''
+      this.form.paydate = ''
+      this.form.creatuser = ''
+      this.form.createdate = ''
+      this.getMesOrderSearch()
+    },
+    // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+    getCurrentRow(row) {
+      console.log(row, 1)
+    },
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      this.$nextTick(() => {
+        this.dialogForm.OrgCode = row.org_code
+        this.dialogForm.OrgName = row.org_name
+        this.dialogForm.SupUnit = row.parent_id
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteOrganization({ orgid: row.code }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            this.getMesOrderSearch()
+          }
+        })
+      }).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 = {
+            OrganCode: this.dialogForm.OrgCode,
+            OrganName: this.dialogForm.OrgName,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+          AddUpdateOrganization(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+              this.getMesOrderSearch()
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 250
+        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;
+  //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>
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 77e192c..b5dad52 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -11,7 +11,12 @@
         >
           <div class="elForm">
             <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
-              <el-select v-model="form.erporderstus" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+              <el-select
+                v-model="form.erporderstus"
+                :popper-append-to-body="false"
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+              >
                 <el-option
                   v-for="item in erporderstusArr"
                   :key="item.code"
@@ -20,11 +25,12 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
-              <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+            <el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
+              <el-input v-model="form.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
-            <el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
-              <el-select v-model="form.OrgType" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+
+            <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+              <el-select v-model="form.partcode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
                 <el-option
                   v-for="item in OrgTypeArr"
                   :key="item.code"
@@ -33,8 +39,30 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+            <el-form-item label="浜у搧瑙勬牸" style=" display: flex;">
+              <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+            <el-form-item label="浜や粯鏃堕棿" style=" display: flex;">
+              <el-date-picker
+                v-model="form.paydate"
+                type="date"
+                style="width: 200px"
+                placeholder="閫夋嫨鏃ユ湡"
+              />
+            </el-form-item>
             <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
-              <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
+              <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+            <el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
+              <el-date-picker
+                v-model="form.createdate"
+                type="date"
+                style="width: 200px"
+                placeholder="閫夋嫨鏃ユ湡"
+              />
             </el-form-item>
           </div>
           <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
@@ -45,8 +73,18 @@
       </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>
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+        >鍚屾ERP
+        </el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-switch-button"
+        >璁㈠崟鍏抽棴
+        </el-button>
+        <!--        <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">
@@ -66,46 +104,78 @@
           <!--            width="50"-->
           <!--          />-->
           <el-table-column
+            width="50"
+          >
+            <template scope="scope">
+              <el-radio
+                v-model="radioSelected"
+                style="color: #fff;padding-left: 10px; margin-right: -25px;"
+                @change.native="getCurrentRow(scope.row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
             prop="RowNum"
             width="50"
             label="搴忓彿"
           />
           <el-table-column
-            prop="org_code"
-            label="缁勭粐缂栫爜"
+            prop="status"
+            label="璁㈠崟鐘舵��"
             sortable="custom"
-          />
-          <el-table-column
-            prop="org_name"
-            label="缁勭粐鍚嶇О"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="description"
-            label="缁勭粐绫诲瀷"
-            sortable="custom"
+            width="110"
           >
             <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>
+              <div v-if="row.status==='CREATING'">杩涜涓�</div>
+              <div v-if="row.status==='NEW'">鏈紑濮�</div>
             </template>
           </el-table-column>
           <el-table-column
-            prop="parentorg_name"
-            label="涓婄骇鍗曚綅"
+            prop="wo"
+            label="璁㈠崟缂栧彿"
             sortable="custom"
           />
           <el-table-column
-            prop="lm_user"
+            prop="partcode"
+            label="浜у搧缂栫爜"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="partname"
+            label="浜у搧鍚嶇О"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="partspec"
+            label="浜у搧瑙勬牸"
+            sortable="custom"
+            width="110"
+          />
+          <el-table-column
+            prop="qty"
+            label="璁㈠崟鏁伴噺"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="wkshp_name"
+            label="鐢熸垚杞﹂棿"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="paydate"
+            label="瑕佹眰浜や粯鏃堕棿"
+            sortable="custom"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="createuser"
             label="鍒涘缓浜哄憳"
             sortable="custom"
           />
           <el-table-column
-            prop="lm_date"
+            prop="createdate"
             label="鍒涘缓鏃堕棿"
+            show-overflow-tooltip
             sortable="custom"
           />
           <el-table-column
@@ -113,8 +183,8 @@
           >
             <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>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
+                <!--                <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
               </div>
             </template>
           </el-table-column>
@@ -134,36 +204,61 @@
     </div>
 
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :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-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 prop="SupUnit" label="涓婄骇鍗曚綅">
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+        <el-form-item label="璁㈠崟鐘舵��" prop="OrgCode">
           <el-select
-            v-model="dialogForm.SupUnit"
+            v-model="form.partcode"
+            disabled
+            :popper-append-to-body="false"
             style="width: 220px"
             placeholder="璇烽�夋嫨"
-            :popper-append-to-body="false"
           >
             <el-option
-              v-for="item in SupUnitArr"
+              v-for="item in OrgTypeArr"
               :key="item.code"
               :label="item.name"
               :value="item.code"
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="璁㈠崟缂栧彿" prop="OrgCode">
+          <el-input v-model="dialogForm.OrgCode" disabled style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="浜у搧缂栫爜" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="浜у搧鍚嶇О" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="璁㈠崟鏁伴噺" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="浜у搧瑙勬牸" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" disabled 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 label="涓嬪崟鏁伴噺" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="浜や粯鏃堕棿" prop="OrgName">
+          <el-date-picker
+            v-model="dialogForm.OrgName"
+            type="date"
+            style="width: 220px"
+            placeholder="閫夋嫨鏃ユ湡"
+          />
+          <!--          <el-input v-model="dialogForm.OrgName" style="width: 220px" />-->
+        </el-form-item>
+
       </el-form>
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
@@ -218,9 +313,10 @@
       },
       erporderstusArr: [
         { code: 'CREATING', name: '杩涜涓�' },
-        { code: 'CREATE', name: '鏈紑濮�' }
+        { code: 'NEW', name: '鏈紑濮�' }
       ],
       total: 10,
+      radioSelected: '',
       tableData: [],
       dialogVisible: false,
       dialogForm: {
@@ -280,13 +376,20 @@
     },
     // 閲嶇疆
     reset() {
-      this.form.OrgCode = ''
-      this.form.OrgName = ''
-      this.form.OrgType = ''
-      this.form.UserName = ''
+      this.form.erporderstus = ''
+      this.form.erpordercode = ''
+      this.form.partcode = ''
+      this.form.partname = ''
+      this.form.partspec = ''
+      this.form.paydate = ''
+      this.form.creatuser = ''
+      this.form.createdate = ''
       this.getErpOrderSearch()
     },
-
+    // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+    getCurrentRow(row) {
+      console.log(row, 1)
+    },
     // 鏂板鎸夐挳
     add(operation) {
       this.operation = operation
@@ -376,9 +479,11 @@
   border: none;
   padding: 0 20px;
 }
+
 ::v-deep .el-button--primary:hover {
   border: none;
 }
+
 ::v-deep .el-button--info {
   height: 30px;
   display: flex;
@@ -434,6 +539,7 @@
   height: 30px;
   line-height: 30px;
 }
+
 ::v-deep .el-input__inner:focus {
   border-color: $main_color;
 }
@@ -510,17 +616,19 @@
   border-color: $main_color;
 }
 
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
   border-color: $main_color;
 }
 
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
   color: $main_color;
 }
-::v-deep .el-checkbox__inner:hover{
+
+::v-deep .el-checkbox__inner:hover {
   border-color: $main_color;
 }
-::v-deep .el-textarea__inner:focus{
+
+::v-deep .el-textarea__inner:focus {
   border-color: $main_color;
 }
 
diff --git a/src/views/template.vue b/src/views/template.vue
index 2d2c1d0..c3bb35b 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -106,7 +106,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -127,7 +127,7 @@
     </div>
 
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       top="15vh"
diff --git a/src/views/template2.vue b/src/views/template2.vue
index 9e363d4..e5f04c9 100644
--- a/src/views/template2.vue
+++ b/src/views/template2.vue
@@ -105,7 +105,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -126,7 +126,7 @@
     </div>
 
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       top="15vh"
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 9f871ec..1811fed 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -86,7 +86,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -107,7 +107,7 @@
     </div>
 
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       :close-on-click-modal="false"
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index 61d9696..67b4574 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -101,7 +101,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -122,7 +122,7 @@
     </div>
 
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       :close-on-click-modal="false"
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index 6888427..28e66fe 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -101,7 +101,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <!--                <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
               </div>
             </template>
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index a1e97cb..5d81552 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -181,7 +181,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -204,7 +204,7 @@
     <!--鏂板缂栬緫瀵硅瘽妗�-->
     <el-dialog
       :close-on-click-modal="false"
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       top="15vh"
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index a198963..632b3c9 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -147,7 +147,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -169,7 +169,7 @@
 
     <!--鏂板淇敼瀵硅瘽妗�-->
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       :close-on-click-modal="false"
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 8535de9..ad3a92a 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -96,7 +96,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <!--                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>-->
+                <!--                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
                 <el-button type="text" @click="edit('edit',row)">棰勮</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 736c146..bc9b21e 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -176,7 +176,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -197,7 +197,7 @@
     </div>
 
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="70%"
       top="15vh"
@@ -752,12 +752,11 @@
         type: 'warning'
       }).then(() => {
         const data = {
-          partcode: this.eqpTable.partcode,
-          routecode: this.eqpTable.routecode,
-          stepcode: this.eqpTable.stepcode,
+          partcode: row.partcode,
+          routecode: row.route_code,
+          stepcode: row.stepcode,
           eqpcode: row.eqp_code
         }
-        console.log(data)
         DeleteBeatRate(data).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
@@ -783,6 +782,7 @@
       this.stepDialogArr = []
       this.eqpDialogArr = []
       this.$refs.dialogForm.clearValidate()
+      this.getBeatRateSearch()
     },
     // 瀵硅瘽妗嗗彇娑�
     dialogVisibleCancel() {
diff --git a/src/views/zzmx/wllx.vue b/src/views/zzmx/wllx.vue
index 785b395..b583071 100644
--- a/src/views/zzmx/wllx.vue
+++ b/src/views/zzmx/wllx.vue
@@ -90,7 +90,7 @@
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
                 <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
               </div>
             </template>
@@ -111,7 +111,7 @@
     </div>
 
     <el-dialog
-      :title="operation==='add'?'鏂板':'淇敼'"
+      :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
       width="50%"
       top="15vh"

--
Gitblit v1.9.3