From 72a98a10c368a32140a9848a48f69690e59ac583 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 12 四月 2024 15:46:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silk-web

---
 src/views/employeeSalary/machineManage/components/addDialog.vue        |  165 +++++++++++
 src/views/employeeSalary/apprenticeshipManage/components/addDialog.vue |   75 +----
 src/views/systemSetting/silkPriceStandard/components/addDialog.vue     |    5 
 src/components/makepager/pager/mixin/pageMixin.js                      |    2 
 src/views/employeeSalary/machineManage/index.vue                       |  186 ++++++++++++
 src/views/employeeSalary/salaryPlan/index.vue                          |  175 ++++++++++++
 src/views/employeeSalary/apprenticeshipManage/index.vue                |   32 ++
 src/views/employeeSalary/salaryPlan/components/addDialog.vue           |  143 ++++++++++
 8 files changed, 706 insertions(+), 77 deletions(-)

diff --git a/src/components/makepager/pager/mixin/pageMixin.js b/src/components/makepager/pager/mixin/pageMixin.js
index 3e2e54e..ad77eda 100644
--- a/src/components/makepager/pager/mixin/pageMixin.js
+++ b/src/components/makepager/pager/mixin/pageMixin.js
@@ -7,7 +7,7 @@
     return {
       pagerOptions: {
         currPage: 1,
-        pageSize: 10,
+        pageSize: 15,
         totalCount: 0
       },
       pagerEvents
diff --git a/src/views/employeeSalary/apprenticeshipManage/components/addDialog.vue b/src/views/employeeSalary/apprenticeshipManage/components/addDialog.vue
index 9404393..3c65114 100644
--- a/src/views/employeeSalary/apprenticeshipManage/components/addDialog.vue
+++ b/src/views/employeeSalary/apprenticeshipManage/components/addDialog.vue
@@ -6,75 +6,44 @@
       width="30%"
       :before-close="handleClose">
       <el-form :inline="true" label-width="20%" style="width: 100%;" :model="editConfig.infomitton" :rules="rules" ref="ruleForm" >
-        <el-form-item prop="workshopNumber"  label="杞﹂棿" style="width: 100%;" >
-          <el-select 
-            :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.workshopNumber" placeholder="璇烽�夋嫨杞﹂棿">
-            <el-option
-              v-for="item in workshopList"
-              :key="item.ID"
-              :label="item.name"
-              :value="item.ID">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="缁勫埆" style="width: 100%;" 
+        <el-form-item label="鍛樺伐缂栫爜" style="width: 100%;" 
             prop="groupNumber"  >
-          <!-- <el-input-number
-            v-model="form.workshopNumber"
-            placeholder="璇疯緭鍏ョ粍鍒�"
-            :controls="false"
-            style="width: 100%; margin-right: 5px;text-align:left;"
-          ></el-input-number> -->
           <el-input
             :disabled="this.editConfig.dialogTitle==='鏌ョ湅'"
             v-model="editConfig.infomitton.groupNumber"
             :rows="4"
             style="resize: none !important;"
-            placeholder="璇疯緭鍏ョ粍鍒�"
+            placeholder="璇疯緭鍏ュ憳宸ョ紪鐮�"
             >
           </el-input>
         </el-form-item>
-        
-        <el-form-item label="寮�濮嬭溅鍙�" style="width: 100%;" >
+        <el-form-item label="鍛樺伐濮撳悕" style="width: 100%;" >
           <el-input
             :disabled="this.editConfig.dialogTitle==='鏌ョ湅'"
-            v-model="editConfig.infomitton.startCarNumber"
+            v-model="editConfig.infomitton.groupNumber"
             :rows="4"
             style="resize: none !important;"
-            placeholder="璇疯緭鍏ュ紑濮嬭溅鍙�"
+            placeholder="璇疯緭鍏ュ憳宸ュ鍚�"
             >
           </el-input>
         </el-form-item>
-        <el-form-item label="缁撴潫杞﹀彿" style="width: 100%;" >
+        <el-form-item label="甯﹀緬澶╂暟" style="width: 100%;" 
+        prop="groupNumber">
+          <el-date-picker
+            style="width:100%"
+            v-model="editConfig.infomitton.groupNumber"
+            type="month"
+            placeholder="閫夋嫨鏈�">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="甯﹀緬澶╂暟" style="width: 100%;" 
+            prop="groupNumber"  >
           <el-input
             :disabled="this.editConfig.dialogTitle==='鏌ョ湅'"
-            v-model="editConfig.infomitton.endCarNumber"
+            v-model="editConfig.infomitton.groupNumber"
             :rows="4"
             style="resize: none !important;"
-            placeholder="璇疯緭鍏ョ粨鏉熻溅鍙�"
-            >
-          </el-input>
-        </el-form-item>
-        <el-form-item label="鍗婅溅鏍囧織" style="width: 100%;" >
-          <el-select 
-            :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.carFlag" placeholder="璇烽�夋嫨鍗婅溅鏍囧織">
-            <el-option
-              v-for="item in carFlagList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="澶囨敞" style="width: 100%;" >
-          <el-input
-            :disabled="this.editConfig.dialogTitle==='鏌ョ湅'"
-            v-model="editConfig.infomitton.notes"
-            type="textarea"
-            :rows="4"
-            style="resize: none !important;"
-            placeholder=""
+            placeholder="璇疯緭鍏ュ憳宸ョ紪鐮�"
             >
           </el-input>
         </el-form-item>
@@ -107,14 +76,6 @@
   data() {
     return {
       editConfig:this.editDiaConfig,
-      form: {
-        workshopNumber:null,
-        groupNumber:null,
-        startCarNumber:null,
-        endCarNumber:null,
-        carFlag:null,
-        notes:null
-      },
       workshopList:[],
       carFlagList:[
       ],
diff --git a/src/views/employeeSalary/apprenticeshipManage/index.vue b/src/views/employeeSalary/apprenticeshipManage/index.vue
index 0b5d8a4..395aae8 100644
--- a/src/views/employeeSalary/apprenticeshipManage/index.vue
+++ b/src/views/employeeSalary/apprenticeshipManage/index.vue
@@ -40,13 +40,13 @@
 </template>
 
 <script>
-import AddDialog from "@/views/systemSetting/workshopManage/components/addDialog.vue"
-
+import AddDialog from "@/views/employeeSalary/apprenticeshipManage/components/addDialog.vue"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
 export default {
   name: "apprenticeshipManage",
   props: {},
   components: {AddDialog},
-  mixins: [],
+  mixins: [pageMixin],
   computed: {},
   data() {
     return {
@@ -67,6 +67,9 @@
           TabsIndex:0,
           workshopId:null,
         }
+      },
+      getDataParams: {
+        keyWord: '',
       },
     }
   },
@@ -112,6 +115,29 @@
       this.editConfig.dialogTitle="鏂板"
       this.editConfig.visible=true
     },
+    // 鎼滅储
+    onFilterSearch(searchText) {
+      this.getDataParams.keyWord = searchText,
+        this.getData()
+    },
+    // 鍒锋柊
+    refreshClick() {
+      this.getDataParams.keyWord = ""
+      this.pagerOptions.currPage = 1
+      this.pagerOptions.pageSize = 15
+      // this.$refs.searchRef.searchInput = ""
+      this.getData()
+    },
+    // 鎵撳嵃
+    printClick() { },
+    // 缁勫埆
+    handleShow() {
+
+    },
+    // 琛ㄦ牸琛岀偣鍑�
+    tableRowClick(row) {
+      console.log(row, "row")
+    },
   }
 }
 </script>
diff --git a/src/views/employeeSalary/machineManage/components/addDialog.vue b/src/views/employeeSalary/machineManage/components/addDialog.vue
new file mode 100644
index 0000000..be18a75
--- /dev/null
+++ b/src/views/employeeSalary/machineManage/components/addDialog.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="add_wordshop">
+    <el-dialog :title="editConfig.dialogTitle + '杞﹂棿绠＄悊'" :visible.sync="editConfig.visible" width="30%"
+      :before-close="handleClose">
+      <el-form :inline="true" label-width="20%" style="width: 100%;" :model="editConfig.infomitton" :rules="rules"
+        ref="ruleForm">
+        <el-form-item label="鏃ユ湡鍖洪棿" style="width: 100%;" prop="groupNumber">
+          <el-date-picker 
+            style="width: 100%;"
+            v-model="editConfig.infomitton.groupNumber" 
+            type="daterange" 
+            range-separator="鑷�" 
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item prop="workshop"  label="杞﹂棿" style="width: 100%;" >
+          <el-select 
+            :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.workshop" value-key="name" placeholder="璇烽�夋嫨杞﹂棿">
+            <el-option
+              v-for="item in workshopList"
+              :key="item.ID"
+              :label="item.name"
+              :value="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="workshop"  label="缁勫埆" style="width: 100%;" >
+          <el-select 
+            :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.groupNumber" value-key="name" placeholder="璇烽�夋嫨杞﹂棿">
+            <el-option
+              v-for="item in workshopList"
+              :key="item.ID"
+              :label="item.name"
+              :value="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="workshop"  label="鏈哄彴鍙�" style="width: 100%;" >
+          <el-select 
+            :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.groupNumber" value-key="name" placeholder="璇烽�夋嫨杞﹂棿">
+            <el-option
+              v-for="item in workshopList"
+              :key="item.ID"
+              :label="item.name"
+              :value="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="workshop"  label="鍛樺伐濮撳悕" style="width: 100%;" >
+          <el-select 
+            :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.groupNumber" value-key="name" placeholder="璇烽�夋嫨杞﹂棿">
+            <el-option
+              v-for="item in workshopList"
+              :key="item.ID"
+              :label="item.name"
+              :value="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="editConfig.visible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="commitForm('ruleForm')">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import {} from "@/api/systemSetting/workshopManage"
+export default {
+  props: {
+    editDiaConfig: {
+      type: Object,
+      default: () => {
+        return {
+          visible: false,
+          dialogTitle: "娣诲姞",
+          isReadonly: true,
+          infomitton: {
+          },
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      editConfig: this.editDiaConfig,
+      workshopList: [],
+      carFlagList: [
+      ],
+      rules: {
+        workshopNumber: [
+          { required: true, message: '璇烽�夋嫨杞﹂棿', trigger: 'change' }
+        ],
+        groupNumber: [
+          { required: true, message: '璇峰～鍐欑粍鍒�', trigger: 'change' }
+        ]
+      },
+    };
+  },
+  computed: {
+  },
+  created() {
+  },
+  mounted() {
+
+  },
+  watch: {
+
+  },
+  methods: {
+    handleClose(done) {
+      done();
+    },
+    setParams() {
+      let params = {
+        workshopNumber: this.editConfig.infomitton.workshopNumber + '',
+        groupNumber: Number(this.editConfig.infomitton.groupNumber),
+        startCarNumber: Number(this.editConfig.infomitton.startCarNumber),
+        endCarNumber: Number(this.editConfig.infomitton.endCarNumber),
+        carFlag: Number(this.editConfig.infomitton.carFlag),
+        notes: this.editConfig.infomitton.notes,
+        // id:Number(this.editConfig.infomitton.workshopId),
+      }
+      return params
+    },
+    async commitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          console.log("鏍￠獙閫氳繃")
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+
+
+    }
+  },
+  components: {
+
+  },
+};
+</script>
+
+<style scoped lang="scss">
+::v-deep .el-form-item__content {
+  width: 70% !important;
+}
+
+::v-deep {
+  .el-form {
+    .el-input__inner {
+      text-align: left;
+    }
+  }
+
+  .el-select {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/employeeSalary/machineManage/index.vue b/src/views/employeeSalary/machineManage/index.vue
index a3cf584..69fc85b 100644
--- a/src/views/employeeSalary/machineManage/index.vue
+++ b/src/views/employeeSalary/machineManage/index.vue
@@ -1,21 +1,193 @@
 <template>
-  <div class="container"></div>
+  <div class="container">
+    <div class="filter-card">
+      <CommonSearch ref="searchRef" :show-add="false" :amount-view="false" placeholder="璇疯緭鍏ュ叧閿瘝" @searchClick="onFilterSearch">
+        <template slot="leftButton">
+          <el-button size="small" type="primary" @click="addBtnClick" >鏂板</el-button>
+          <el-button size="small" type="primary" @click="refreshClick">鍒锋柊</el-button>
+          <el-button size="small" type="primary" @click="printClick">鎵撳嵃</el-button>
+        </template>
+      </CommonSearch>
+    </div>
+    <div class="body-card">
+      <div class="list-view">
+        <TableCommonView
+          :table-list="tableList"
+          @selTableCol="selTableCol"
+          @handleShow="handleShow"
+          @tableRowClick="tableRowClick"
+        >
+          <template slot="tableButton">
+            <el-table-column label="鎿嶄綔" width="180">
+              <template slot-scope="scope">
+                <el-button @click.stop="handleClick(scope.row, '鏌ョ湅')" type="text" size="small">鏌ョ湅</el-button>
+                <el-button @click.stop="handleClick(scope.row, '淇敼')" type="text" size="small">淇敼</el-button>
+                <el-button @click.stop="handleClick(scope.row, '鍒犻櫎')" type="text" size="small">鍒犻櫎</el-button>
+                
+              </template>
+            </el-table-column>
+          </template>
+        </TableCommonView>
+      </div>
+      <AddDialog 
+        :editDiaConfig="editConfig"
+      />
+      <div class="btn-pager">
+        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
+import AddDialog from "@/views/employeeSalary/machineManage/components/addDialog.vue"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
 export default {
   name: "machineManage",
   props: {},
-  components: {},
-  mixins: [],
+  components: {AddDialog},
+  mixins: [pageMixin],
   computed: {},
   data() {
-    return {}
+    return {
+      tableList: {},
+      showCol: ["杞﹂棿", "缁勫埆", "寮�濮嬭溅鍙�", "缁撴潫杞﹀彿", "鍗婅溅鏍囧織", "澶囨敞"],
+      tableColumn: [
+        // { label: "杞﹂棿", prop: "workshopNumber",iconRight:"el-icon-setting"},
+        { label: "杞﹂棿", prop: "workshopNumber",},
+        { label: "缁勫埆", prop: "groupNumber", },
+        { label: "寮�濮嬭溅鍙�", prop: "startCarNumber" },
+        { label: "缁撴潫杞﹀彿", prop: "endCarNumber" },
+        { label: "鍗婅溅鏍囧織", prop: "carFlag",isCallMethod: true, getCallMethod: this.getStatusCarFlag },
+        { label: "澶囨敞", prop: "notes", },
+      ],
+      editConfig:{
+        visible:false,
+        infomitton:{
+          TabsIndex:0,
+          workshopId:null,
+        }
+      },
+      getDataParams: {
+        keyWord: '',
+      },
+    }
   },
-  created() {},
-  methods: {}
+  created() {
+    this.setTable()
+  },
+  methods: {
+    setTable() {
+      // top 鏄庣粏鍗曞垪琛�
+      this.tableList = {
+        selectIndex: true,
+        tableInfomation: [],
+        allcol: [],
+        showcol: this.showCol,
+        tableColumn: this.setColumnVisible(this.showCol, this.tableColumn)
+      }
+      this.setTableList(this.tableList)
+    },
+    setColumnVisible(showCol, tableColumn) {
+      return tableColumn.map((ele) => {
+        return {
+          ...ele,
+          isShowColumn: showCol.includes(ele.label)
+        }
+      })
+    },
+    setTableList(tableList) {
+      tableList.allcol = tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
+      this.searchOptions = []
+      for (let i = 0; i < tableList.tableColumn.length; i++) {
+        const label = tableList.tableColumn[i].label
+        const value = tableList.tableColumn[i].prop
+        this.searchOptions.push({ value: value, label: label })
+      }
+    },
+    selTableCol(val) {
+      this.showcol = val
+      this.tableList.tableColumn = this.setColumnVisible(val, this.tableColumn)
+    },
+    // 鏂板
+    addBtnClick() {
+      this.editConfig.infomitton={}
+      this.editConfig.dialogTitle="鏂板"
+      this.editConfig.visible=true
+    },
+    // 鎼滅储
+    onFilterSearch(searchText) {
+      this.getDataParams.keyWord = searchText,
+        this.getData()
+    },
+    // 鍒锋柊
+    refreshClick() {
+      this.getDataParams.keyWord = ""
+      this.pagerOptions.currPage = 1
+      this.pagerOptions.pageSize = 15
+      // this.$refs.searchRef.searchInput = ""
+      this.getData()
+    },
+    // 鎵撳嵃
+    printClick() { },
+    // 缁勫埆
+    handleShow() {
+
+    },
+    // 琛ㄦ牸琛岀偣鍑�
+    tableRowClick(row) {
+      console.log(row, "row")
+    },
+  }
 }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+.container {
+  height: 100%;
+  .filter-card {
+    margin: 20px 30px;
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding: 0 20px 0 20px;
+    border-radius: 4px;
+    background-color: #fff;
+  }
+  .body-card {
+    margin: 0 30px;
+    background-color: #fff;
+    padding: 10px 15px;
+    height: calc(100% - 180px);
+    border-radius: 4px;
+    .edit-save {
+      display: flex;
+      align-items: center;
+      margin-bottom: 10px;
+      .edit-save-icon {
+        font-size: 24px;
+        color: #5582f3;
+        cursor: pointer;
+      }
+      .edit-sace-label {
+        margin-left: 10px;
+        font-size: 14px;
+        color: #000000d8;
+      }
+    }
+  }
+}
+.list-view {
+  height: calc(100% - 60px);
+  overflow: hidden;
+}
+.btn-pager {
+  display: flex;
+  margin-top: 10px;
+  .page {
+    margin-left: auto;
+  }
+}
+</style>
diff --git a/src/views/employeeSalary/salaryPlan/components/addDialog.vue b/src/views/employeeSalary/salaryPlan/components/addDialog.vue
new file mode 100644
index 0000000..0959c77
--- /dev/null
+++ b/src/views/employeeSalary/salaryPlan/components/addDialog.vue
@@ -0,0 +1,143 @@
+<template>
+  <div class="add_wordshop">
+    <el-dialog :title="editConfig.dialogTitle + '杞﹂棿绠＄悊'" :visible.sync="editConfig.visible" width="30%"
+      :before-close="handleClose">
+      <el-form :inline="true" label-width="20%" style="width: 100%;" :model="editConfig.infomitton" :rules="rules"
+        ref="ruleForm">
+        <el-form-item label="鏂规鍚嶇О" style="width: 100%;" prop="groupNumber">
+          <el-input v-model="editConfig.infomitton.workshop" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+        </el-form-item>
+        <el-form-item prop="workshop"  label="宸ョ" style="width: 100%;" >
+          <el-select 
+            :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.workshop" value-key="name" placeholder="璇烽�夋嫨杞﹂棿">
+            <el-option
+              v-for="item in workshopList"
+              :key="item.ID"
+              :label="item.name"
+              :value="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="workshop"  label="钖祫绫诲瀷" style="width: 100%;" >
+          <el-select 
+            :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.groupNumber" value-key="name" placeholder="璇烽�夋嫨杞﹂棿">
+            <el-option
+              v-for="item in workshopList"
+              :key="item.ID"
+              :label="item.name"
+              :value="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="workshop"  label="璁¤垂鍏紡瀹氫箟" style="width: 100%;" >
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4}"
+            placeholder="璇疯緭鍏ュ唴瀹�"
+            v-model="editConfig.infomitton.workshop">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="editConfig.visible = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="commitForm('ruleForm')">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import {} from "@/api/systemSetting/workshopManage"
+export default {
+  props: {
+    editDiaConfig: {
+      type: Object,
+      default: () => {
+        return {
+          visible: false,
+          dialogTitle: "娣诲姞",
+          isReadonly: true,
+          infomitton: {
+          },
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      editConfig: this.editDiaConfig,
+      workshopList: [],
+      carFlagList: [
+      ],
+      rules: {
+        workshopNumber: [
+          { required: true, message: '璇烽�夋嫨杞﹂棿', trigger: 'change' }
+        ],
+        groupNumber: [
+          { required: true, message: '璇峰～鍐欑粍鍒�', trigger: 'change' }
+        ]
+      },
+    };
+  },
+  computed: {
+  },
+  created() {
+  },
+  mounted() {
+
+  },
+  watch: {
+
+  },
+  methods: {
+    handleClose(done) {
+      done();
+    },
+    setParams() {
+      let params = {
+        workshopNumber: this.editConfig.infomitton.workshopNumber + '',
+        groupNumber: Number(this.editConfig.infomitton.groupNumber),
+        startCarNumber: Number(this.editConfig.infomitton.startCarNumber),
+        endCarNumber: Number(this.editConfig.infomitton.endCarNumber),
+        carFlag: Number(this.editConfig.infomitton.carFlag),
+        notes: this.editConfig.infomitton.notes,
+        // id:Number(this.editConfig.infomitton.workshopId),
+      }
+      return params
+    },
+    async commitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          console.log("鏍￠獙閫氳繃")
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+
+
+    }
+  },
+  components: {
+
+  },
+};
+</script>
+
+<style scoped lang="scss">
+::v-deep .el-form-item__content {
+  width: 70% !important;
+}
+
+::v-deep {
+  .el-form {
+    .el-input__inner {
+      text-align: left;
+    }
+  }
+
+  .el-select {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index 58f3bb2..732c3c1 100644
--- a/src/views/employeeSalary/salaryPlan/index.vue
+++ b/src/views/employeeSalary/salaryPlan/index.vue
@@ -1,21 +1,182 @@
 <template>
-  <div class="container"></div>
+  <div class="container">
+    <div class="filter-card">
+      <CommonSearch ref="searchRef" :show-add="false" :amount-view="false" placeholder="璇疯緭鍏ュ叧閿瘝" @searchClick="onFilterSearch">
+        <template slot="leftButton">
+          <el-button size="small" type="primary" @click="addBtnClick" >鏂板</el-button>
+        </template>
+      </CommonSearch>
+    </div>
+    <div class="body-card">
+      <div class="list-view">
+        <TableCommonView
+          :table-list="tableList"
+          @selTableCol="selTableCol"
+          @handleShow="handleShow"
+          @tableRowClick="tableRowClick"
+        >
+          <template slot="tableButton">
+            <el-table-column label="鎿嶄綔" width="180">
+              <template slot-scope="scope">
+                <el-button @click.stop="handleClick(scope.row, '鏌ョ湅')" type="text" size="small">鏌ョ湅</el-button>
+                <el-button @click.stop="handleClick(scope.row, '淇敼')" type="text" size="small">淇敼</el-button>
+                <el-button @click.stop="handleClick(scope.row, '鍒犻櫎')" type="text" size="small">鍒犻櫎</el-button>
+                
+              </template>
+            </el-table-column>
+          </template>
+        </TableCommonView>
+      </div>
+      <AddDialog 
+        :editDiaConfig="editConfig"
+      />
+      <div class="btn-pager">
+        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
+import AddDialog from "@/views/employeeSalary/salaryPlan/components/addDialog.vue"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
 export default {
   name: "salaryPlan",
   props: {},
-  components: {},
-  mixins: [],
+  components: {AddDialog},
+  mixins: [pageMixin],
   computed: {},
   data() {
-    return {}
+    return {
+      tableList: {},
+      showCol: ["鏂规鍚嶇О", "宸ョ", "钖祫绫诲瀷", "璁¤垂鍛ㄦ湡", "璁¤垂鍏紡瀹氫箟", "娣诲姞鏃堕棿", "娣诲姞浜�"],
+      tableColumn: [
+        // { label: "杞﹂棿", prop: "workshopNumber",iconRight:"el-icon-setting"},
+        { label: "鏂规鍚嶇О", prop: "workshopNumber",},
+        { label: "宸ョ", prop: "groupNumber", },
+        { label: "钖祫绫诲瀷", prop: "startCarNumber" },
+        { label: "璁¤垂鍛ㄦ湡", prop: "endCarNumber" },
+        { label: "璁¤垂鍏紡瀹氫箟", prop: "carFlag", },
+        { label: "娣诲姞鏃堕棿", prop: "notes", },
+        { label: "娣诲姞浜�", prop: "notes", },
+      ],
+      editConfig:{
+        visible:false,
+        infomitton:{
+          TabsIndex:0,
+          workshopId:null,
+        }
+      },
+      getDataParams: {
+        keyWord: '',
+      },
+    }
   },
-  created() {},
-  methods: {}
+  created() {
+    this.setTable()
+  },
+  methods: {
+    setTable() {
+      // top 鏄庣粏鍗曞垪琛�
+      this.tableList = {
+        selectIndex: true,
+        tableInfomation: [],
+        allcol: [],
+        showcol: this.showCol,
+        tableColumn: this.setColumnVisible(this.showCol, this.tableColumn)
+      }
+      this.setTableList(this.tableList)
+    },
+    setColumnVisible(showCol, tableColumn) {
+      return tableColumn.map((ele) => {
+        return {
+          ...ele,
+          isShowColumn: showCol.includes(ele.label)
+        }
+      })
+    },
+    setTableList(tableList) {
+      tableList.allcol = tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
+      this.searchOptions = []
+      for (let i = 0; i < tableList.tableColumn.length; i++) {
+        const label = tableList.tableColumn[i].label
+        const value = tableList.tableColumn[i].prop
+        this.searchOptions.push({ value: value, label: label })
+      }
+    },
+    selTableCol(val) {
+      this.showcol = val
+      this.tableList.tableColumn = this.setColumnVisible(val, this.tableColumn)
+    },
+    // 鏂板
+    addBtnClick() {
+      this.editConfig.infomitton={}
+      this.editConfig.dialogTitle="鏂板"
+      this.editConfig.visible=true
+    },
+    // 鎼滅储
+    onFilterSearch(searchText) {
+      this.getDataParams.keyWord = searchText,
+        this.getData()
+    },
+    // 缁勫埆
+    handleShow() {
+
+    },
+    // 琛ㄦ牸琛岀偣鍑�
+    tableRowClick(row) {
+      console.log(row, "row")
+    },
+  }
 }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+.container {
+  height: 100%;
+  .filter-card {
+    margin: 20px 30px;
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding: 0 20px 0 20px;
+    border-radius: 4px;
+    background-color: #fff;
+  }
+  .body-card {
+    margin: 0 30px;
+    background-color: #fff;
+    padding: 10px 15px;
+    height: calc(100% - 180px);
+    border-radius: 4px;
+    .edit-save {
+      display: flex;
+      align-items: center;
+      margin-bottom: 10px;
+      .edit-save-icon {
+        font-size: 24px;
+        color: #5582f3;
+        cursor: pointer;
+      }
+      .edit-sace-label {
+        margin-left: 10px;
+        font-size: 14px;
+        color: #000000d8;
+      }
+    }
+  }
+}
+.list-view {
+  height: calc(100% - 60px);
+  overflow: hidden;
+}
+.btn-pager {
+  display: flex;
+  margin-top: 10px;
+  .page {
+    margin-left: auto;
+  }
+}
+</style>
diff --git a/src/views/systemSetting/silkPriceStandard/components/addDialog.vue b/src/views/systemSetting/silkPriceStandard/components/addDialog.vue
index 5e4ca50..7dc16f2 100644
--- a/src/views/systemSetting/silkPriceStandard/components/addDialog.vue
+++ b/src/views/systemSetting/silkPriceStandard/components/addDialog.vue
@@ -26,7 +26,7 @@
             style="width: 100%; margin-right: 5px;text-align:left;"
           ></el-input-number> -->
           <el-input :disabled="this.editConfig.dialogTitle === '鏌ョ湅'" v-model="editConfig.infomitton.payStandard" :rows="4"
-            style="resize: none !important;" placeholder="璇疯緭鍏ョ粍鍒�">
+            style="resize: none !important;" placeholder="璇疯緭鍏ヨ柂閰爣鍑�">
           </el-input>
         </el-form-item>
         <el-form-item label="鍗曚綅" style="width: 100%;">
@@ -91,7 +91,8 @@
           { required: true, message: '璇烽�夋嫨鐢熶笣绛夌骇', trigger: 'change' }
         ],
         payStandard: [
-          { required: true, message: '璇烽�夋嫨鐢熶笣绛夌骇', trigger: 'change' }
+          { required: true, message: '璇疯緭鍏ヨ柂閰爣鍑�', trigger: 'change' },
+          {pattern: /^[0-9.]*$/, message: '钖叕鏍囧噯闇�涓烘暟瀛�', trigger: 'blur'}
         ]
       },
     };

--
Gitblit v1.8.0