1.员工加状态；2.备件库存出库记录加冲销；3.设备维修新增加备注

src/views/console/emp/index.vue

@@ -83,7 +83,7 @@
         </el-table-column>
         <el-table-column label="状态" min-width="130px" header-align="center" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.state }}</span>
+            <span>{{scope.row.workstr}}</span>
           </template>
         </el-table-column>
         <el-table-column label="账号数" sortable prop="isuser" min-width="90px" header-align="center" align="center">
@@ -141,9 +141,11 @@
           <el-form-item label="工号" prop="empCode">
             <el-input ref="empCode" v-model="dataform.empCode" />
           </el-form-item>
-          <!-- <el-form-item label="状态" prop="state">
-            <el-input ref="state" v-model="dataform.state" />
-          </el-form-item> -->
+          <el-form-item label="状态" prop="work">
+            <el-select v-model="dataform.work">
+                <el-option v-for="item in workList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+          </el-form-item>
           <el-form-item label="联系方式" prop="tel">
             <el-input ref="tel" v-model="dataform.tel" />
           </el-form-item>
@@ -184,7 +186,7 @@ import waves from '@/directive/waves' // waves directive
 import { isIntegerZero } from '@/utils/validate'
 import { validatePhoneTwo } from '@/utils/validate'
 import enterToNext from '@/directive/enterToNext' // enterToNext directive
-import { PostDataByName, GetDataByName, getRecuData, GetDataByNames, checkButtons, failproccess,GetAccount } from '@/api/common'
+import { PostDataByName, GetDataByName, getRecuData,ExecDataByConfig, GetDataByNames, checkButtons, failproccess,GetAccount } from '@/api/common'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import { MessageBox } from 'element-ui'
 import Cookies from 'js-cookie'
@@ -202,6 +204,7 @@ export default {
       disabled: false,
       tableKey: 0,
       list: [{ sqlname: '', id: 0, sqlstr: '' }],
+      workList:[{id:1,name:'在职'},{id:0,name:'离职'}],
       parentDept: [],
       total: 0,
       listLoading: true,
@@ -380,6 +383,7 @@ export default {
       this.dataform.id = ''
       this.dataform.sort = '0'
       this.dataform.enable = '1'
+      this.dataform.work = 1
       this.defaultCheckedKeys = []
     },
     form_add() {
@@ -411,6 +415,7 @@ export default {
           this.requestParam.parammaps.enable = this.dataform.enable
           this.requestParam.parammaps.pastureId = this.dataform.pastureId
           this.requestParam.parammaps.empCode = this.dataform.empCode
+          this.requestParam.parammaps.work = this.dataform.work
 
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
@@ -449,7 +454,7 @@ export default {
           this.requestParam.parammaps.enable = this.dataform.enable
           this.requestParam.parammaps.pastureId = this.dataform.pastureId
           this.requestParam.parammaps.empCode = this.dataform.empCode
-
+          this.requestParam.parammaps.work = this.dataform.work
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
               this.get_table_data()
@@ -480,21 +485,42 @@ export default {
     edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
-          this.requestParam.name = 'updateEmp'
+          // this.requestParam.name = 'updateEmp'
           this.requestParam.parammaps = {}
           if (this.dataform.easName == '' || this.dataform.easName == undefined) { this.dataform.easName = this.dataform.empname }
-          this.requestParam.parammaps.easName = this.dataform.easName
-          this.requestParam.parammaps.empname = this.dataform.empname
-          this.requestParam.parammaps.deptid = this.dataform.deptid
-          this.requestParam.parammaps.tel = this.dataform.tel
-          this.requestParam.parammaps.position = this.dataform.position
-          this.requestParam.parammaps.remark = this.dataform.remark
-          this.requestParam.parammaps.sort = this.dataform.sort
-          this.requestParam.parammaps.enable = this.dataform.enable
-          this.requestParam.parammaps.pastureId = this.dataform.pastureId
-          this.requestParam.parammaps.empCode = this.dataform.empCode
-          this.requestParam.parammaps.id = this.dataform.id
-          PostDataByName(this.requestParam).then(() => {
+          // this.requestParam.parammaps.easName = this.dataform.easName
+          // this.requestParam.parammaps.empname = this.dataform.empname
+          // this.requestParam.parammaps.deptid = this.dataform.deptid
+          // this.requestParam.parammaps.tel = this.dataform.tel
+          // this.requestParam.parammaps.position = this.dataform.position
+          // this.requestParam.parammaps.remark = this.dataform.remark
+          // this.requestParam.parammaps.sort = this.dataform.sort
+          // this.requestParam.parammaps.enable = this.dataform.enable
+          // this.requestParam.parammaps.pastureId = this.dataform.pastureId
+          // this.requestParam.parammaps.empCode = this.dataform.empCode
+          // this.requestParam.parammaps.id = this.dataform.id
+          // this.requestParam.parammaps.work = this.dataform.work
+          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.data = []
+          this.requestParam.data[0] = { 'name': 'updateEmp', 'type': 'e', 'parammaps': {
+            easName:this.dataform.easName,
+            empname:this.dataform.empname,
+            deptid:this.dataform.deptid,
+            tel:this.dataform.tel,
+            position:this.dataform.position,
+            remark:this.dataform.remark,
+            sort:this.dataform.sort,
+            enable:this.dataform.enable,
+            pastureId:this.dataform.pastureId,
+            empCode:this.dataform.empCode,
+            id:this.dataform.id,
+            work:this.dataform.work,
+          }}
+          this.requestParam.data[1] = { 'name': 'editUserEnable', 'type': 'e', 'parammaps': {
+            enable:this.dataform.enable,
+            empid:this.dataform.id
+          }}
+          ExecDataByConfig(this.requestParam).then(() => {
             this.get_table_data()
             this.resetRequestParam()
             this.dialogFormVisible = false
@@ -529,7 +555,7 @@ export default {
         const elecExcelDatas = [
           {
             tHeader: ['牧场', '姓名', '部门', '职位', '电话','状态', '工号'],
-            filterVal: ['pastureName', 'empname', 'deptname', 'position', 'tel','state', 'empCode'],
+            filterVal: ['pastureName', 'empname', 'deptname', 'position', 'tel','workstr', 'empCode'],
             tableDatas: this.downLoadList,
             sheetName: '员工信息'
           }

src/views/custom/custom/index.vue

@@ -362,6 +362,13 @@
                 <el-table-column label="出库数量" sortable prop="checkoutNumber" min-width="60px" align="center" />
                 <el-table-column label="单价" sortable prop="price" min-width="60px" align="center" />
                 <el-table-column label="总价" sortable prop="sumPrice" min-width="60px" align="center" />
+                <el-table-column   prop="sterilisation" label="冲销状态" min-width="80px" align="center">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.sterilisation == 1">已冲销</span>
+                    <span v-else-if="scope.row.sterilisation == 2">部分冲销</span>
+                    <span v-else>未冲销</span>
+                  </template>
+                </el-table-column>
               </el-table>
               <pagination v-show="total>0" :total="totalDelivery" :page.sync="getdataListParmDelivery.offset" :limit.sync="getdataListParmDelivery.pagecount" @pagination="getCardDelivery" />
             </el-tab-pane>

src/views/maintenance/repair/index.vue

@@ -1709,6 +1709,7 @@ export default {
         repairCode: '',
         deptName: '',
         eqClassId: '',
+        remark:''
       },
       requestEqName: {
         name: 'geteqbyNameCode',
@@ -2345,6 +2346,7 @@ export default {
       this.createTemp.deptName = ''
       this.createTemp.departmentId = ''
       this.createTemp.eqClassId = ''
+      this.createTemp.remark = ''
     },
     changePickId(val) {
       if (this.dialogStatus == 'create') {
@@ -2783,6 +2785,7 @@ export default {
         eqName : this.createTemp.eqName,
         eqCode : this.createTemp.eqCode,
         details : this.createTemp.details,
+        remark : this.createTemp.remark,
         requestTime : parseTime(new Date(), '{y}-{m}-{d}')
       }