2023-4-17

src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -17,11 +17,28 @@
           <Edit v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" class="inline-16" @onSuccess="queryMainData()" :data="mainData" />
           <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :disabled="mainData.status !== '交期待确认'" class="inline-16"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
           <confirmDate v-if="tool.checkAuth($route.name,'replyDate')" class="inline-16" :data="mainData" @onSuccess="queryMainData"></confirmDate>
-          
-          <Check v-if="tool.checkAuth($route.name,'examine') && (mainData.status == '提交' || mainData.status == '交期确认')" class="inline-16" :data="mainData" @onSubmit="onSubmit" @onSuccess="queryMainData"></Check>
-          
-
 
+          <Check v-if="tool.checkAuth($route.name,'examine') && (mainData.status == '提交' || mainData.status == '交期确认')" class="inline-16" :data="mainData" @onSubmit="onSubmit" @onSuccess="queryMainData"></Check>
+          <!-- <el-popover
+            placement="top"
+            v-model="visible">
+            <p  class="mt-10 normal-title">选择评审类型</p>
+            <el-select class="mt-10" v-model="value" placeholder="请选择" size="mini">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.value + '-' + item.remarks"
+                :value="item.value">
+                <span style="float: left">{{ item.value }}</span>
+                <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+              </el-option>
+            </el-select>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="visible = false">取消</el-button>
+              <el-button  type="primary" size="mini" @click="onSubmit('审核')">确定</el-button>
+            </div>
+            <el-button class="inline-16" v-if="tool.checkAuth($route.name,'examine')"  :disabled="mainData.status !== '提交' && mainData.status !== '交期确认'" type="primary" size="mini" slot="reference">审 核</el-button>
+          </el-popover> -->
           <el-button v-if="tool.checkAuth($route.name,'examine')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="onReturnCheck">反审核</el-button>
           <el-button v-if="tool.checkAuth($route.name,'reback')"  type="primary" size="mini" @click="dialogVisible = true">退 回</el-button>
           <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
@@ -74,6 +91,7 @@ export default {
       dialogVisible:false,
       visible:false,
       value:'',
+      options:[],
     }
   },
   provide () {
@@ -92,7 +110,11 @@ export default {
     Check
   },
   methods:{
-    
+    async orderreviewtype () {
+      const res = await this.$store.dispatch('optiontypeselect','orderreviewtype')
+      this.options = res.data
+      this.value = res.data[0].value
+    },
     onEditSuccess(){
       this.queryMainData()
       this.queryTool()
@@ -109,6 +131,7 @@ export default {
       })
       this.mainData = res.data
       this.changeDataStructure()
+      this.orderreviewtype()
     },
     changeDataStructure() {
       let that = this

src/HDrpManagement/toolBorrowingMag/modules/check.vue

@@ -27,6 +27,7 @@
         size="mini"
         border
         :data="list"
+        height="600px"
         style="width: 100%">
         <el-table-column
           prop="TYPE"
@@ -64,7 +65,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div  class="container normal-panel" style="text-align:right">
+      <!-- <div  class="container normal-panel" style="text-align:right">
         <el-pagination
             background
             @size-change="handleSizeChange"
@@ -73,7 +74,7 @@
             :page-sizes="[20, 50, 100, 200]"
             :total="total">
         </el-pagination>
-      </div>
+      </div> -->
     </el-dialog>
   </div>
 </template>
@@ -121,20 +122,27 @@ export default {
       }
     },
     async onSubmit (data) {
-      let res = await this.$api.requested({
-        id:'20230114161402',
-        "content": {
-            "sa_orderid": this.data.sa_orderid,
-            "sys_enterpriseid": this.data.sys_enterpriseid,
-            "sa_accountclassid": this.data.accountclass.sa_accountclassid,
-            "reviewtype":this.value,
-            "erpNo":data.APA01
-          },
-      })
-      this.tool.showMessage(res,() => {
-        this.visible2 = false
-        this.$emit('onSuccess')
+      this.$confirm('确定选择当前押金单吗?','提示',{
+        confirmButtonText:'确定',
+        cancelButtonText:'取消',
+        type:'warning'
+      }).then(async() => {
+        let res = await this.$api.requested({
+          id:'20230114161402',
+          "content": {
+              "sa_orderid": this.data.sa_orderid,
+              "sys_enterpriseid": this.data.sys_enterpriseid,
+              "sa_accountclassid": this.data.accountclass.sa_accountclassid,
+              "reviewtype":this.value,
+              "erpNo":data.APA01
+            },
+        })
+        this.tool.showMessage(res,() => {
+          this.visible2 = false
+          this.$emit('onSuccess')
+        })
       })
+      
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HManagement/accountManage/modules/account_detail.vue

@@ -15,6 +15,10 @@
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" >
+        <selectPeople v-if="tool.checkAuth($route.name,'changeData')" class="inline-16" @selectRow="selectRow" ref="people">
+          <el-button size="mini" slot="input" type="primary" @click="$refs.people.visible=true">数 据 转 交</el-button>
+        </selectPeople>
+        <!-- <changeData class="inline-16"></changeData> -->
         <restPas v-if="tool.checkAuth($route.name,'restpas')" :userid="mainData.userid" class="inline-16"></restPas>
         <useTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></useTemp>
         <unuseTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></unuseTemp>
@@ -38,6 +42,7 @@
 
 <script>
 import unuseTemp from './unuseAccount.vue'
+import selectPeople from './selectPeople'
 import useTemp from './useAccdount.vue'
 import restPas from "@/HManagement/department/staff/detail/modules/restPassword"
 
@@ -65,7 +70,8 @@ export default {
     useTemp,
     detailInfo,
     teamInformation,
-    restPas
+    restPas,
+    selectPeople
   },
   methods:{
     async queryMainData(id) {
@@ -194,6 +200,57 @@ export default {
       ]
       console.log(this.mainAreaData)
     },
+    selectRow (data) {
+      this.$confirm(`确定将数据转移给“${data.name}”吗?`,'提示',{
+        confirmButtonText:'确定',
+        cancelButtonText:'取消',
+        type:'warning'
+      }).then(async () => {
+        let res = await this.$api.requested({
+          "id":20230417130001,
+          "content": {
+              "fromuserid": this.$route.query.id,
+              "touserid": data.userid,
+              "iswithouthr":0
+          }
+        })
+        if (res.data == '成功') {
+          this.$message({
+            message:'操作成功',
+            type:'success'
+          })
+          this.$refs.people.visible = false
+          this.queryMainData()
+        } else {
+          if (res.code == 9) {
+            this.$confirm(res.msg,'提示',{
+              confirmButtonText:'继续',
+              cancelButtonText:'取消',
+              type:'warning'
+            }).then(async () => {
+              let res = await this.$api.requested({
+                "id":20230417130001,
+                "content": {
+                    "fromuserid": this.$route.query.id,
+                    "touserid": data.userid,
+                    "iswithouthr":1
+                }
+              })
+              this.tool.showMessage(res,() => {
+                this.queryMainData()
+                this.$refs.people.visible = false
+              })
+            })
+          } else {
+            this.$message({
+              message:res.msg,
+              type:'warning'
+            })
+          }
+          
+        }
+      })
+    },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
       this.flag = false

src/HManagement/accountManage/modules/changeData.vue

@@ -0,0 +1,118 @@
+<template>
+  <!-- <div> -->
+    <!-- <el-button size="mini" type="primary" @click="onShow">数 据 转 交</el-button>
+    <el-drawer
+      title="账户转交数据"
+      :visible.sync="drawer"
+      size="664px"
+      direction="rtl"
+      append-to-body
+      :show-close="false">
+      <div class="drawer__panel"> -->
+        <selectPeople @selectRow="selectRow" ref="people">
+          <el-input style="width:250px;margin-bottom:10px" slot="input" @focus="$refs.people.visible=true" v-model="target" type="text" size="small" placeholder="请选择转入人"></el-input>
+        </selectPeople>
+        <!-- <el-table
+          size="mini"
+          border
+          :data="list"
+          height="calc(100vh - 200px)"
+          @selection-change="selectionChange">
+            <el-table-column
+                type="selection"
+                width="35">
+            </el-table-column>
+            <el-table-column
+              prop="tablename"
+              label="应用名">
+            </el-table-column>
+        </el-table> -->
+      <!-- </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" :disabled="isDiabled" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer> -->
+  <!-- </div> -->
+</template>
+
+<script>
+import searchInput from '@/template/searchInput/index.vue'
+import selectPeople from './selectPeople'
+export default {
+  components:{searchInput,selectPeople},
+  data () {
+    return {
+      drawer:false,
+      param: {
+        "id":20230417130101,
+        "content": {
+            "userid": ''
+        }
+      },
+      list:[],
+      selectData:[],
+      target:'',
+      targetId:''
+    }
+  },
+  watch: {
+   
+  },
+  computed: {
+    isDiabled () {
+      if (!this.selectData.length || !this.target) return true
+      return false
+    }
+  },
+  methods:{
+    async listData () {
+      let res = await this.$api.requested(this.param)
+    },
+    async onShow () {
+      this.param.content.userid = this.$route.query.id
+      let res = await this.$api.requested(this.param)
+      console.log(res);
+      this.list = res.data
+      this.drawer = true
+    },
+    selectionChange (data) {
+      this.selectData = data
+      console.log(this.selectData);
+    },
+    selectRow (data) {
+      this.target = data.name
+      this.targetId = data.userid
+      this.$refs.people.visible = false
+    },
+    async onSubmit () {
+      let res = await this.$api.requested({
+        "accesstoken": "305def8607e623c06f118e94adcebaf1",
+        "apiversion":20230417130001,
+        "content": {
+            "fromuserid": ,
+            "touserid": 2,
+            "iswithouthr":0
+        }
+      })
+    }
+    // handleSizeChange(val) {
+    //   // console.log(`每页 ${val} 条`);
+    //   this.param.content.pageSize = val
+    //   this.listData()
+    // },
+    // handleCurrentChange(val) {
+    //   // console.log(`当前页: ${val}`);
+    //   this.param.content.pageNumber = val
+    //   this.listData()
+    // },
+  }
+}
+
+</script>
+<style scoped>
+.dialog-footer{
+  margin-top:32px;
+  text-align: center;
+}
+</style>

src/HManagement/accountManage/modules/selectPeople.vue

@@ -0,0 +1,103 @@
+<template>
+  <div> 
+    <el-dialog :visible.sync="visible" append-to-body width="50%">
+      <div class="flex-align-center flex-between mt-10">
+        <el-input 
+          style="width:200px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          placeholder="搜索" 
+          v-model="param.content.where.condition"
+          @keyup.enter.native="listData(param.content.pageNumber = 1)" 
+          @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+      </div>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="tableData"
+          style="width: 100%"
+          size="mini"
+          height="50vh"
+          border>
+          <el-table-column
+            prop="accountno"
+            label="账号">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="账号名称">
+          </el-table-column>
+          <el-table-column
+            prop="phonenumber"
+            label="联系电话">
+          </el-table-column>
+          <el-table-column
+            label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="selectRow(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @current-change="handleCurrentChange"
+            :current-page="param.content.pageNumber"
+            :page-size="param.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id":20221031141102,
+        "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+                "condition": ""
+            }
+        }
+      },
+      tableData: [],
+      total:0,
+      condition:'',
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      // console.log(this.tableData);
+      
+    },
+    handleCurrentChange(val) {
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    selectRow (row) {
+      this.$emit('selectRow',row)
+    }
+  },
+  created () {
+    this.listData()
+  },
+}
+
+</script>
+<style>
+</style>

src/HManagement/department/staff/list/modules/edit.vue

@@ -98,8 +98,8 @@
           <el-col :span="12">
             <el-form-item label="状态:">
               <el-radio-group v-model="form.status">
-                <el-radio :label="0">在职</el-radio>
-                <el-radio :label="1">离职</el-radio>
+                <el-radio label="0">在职</el-radio>
+                <el-radio label="1">离职</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

src/SDrpManagement/agentOrder/details/index.vue

@@ -279,6 +279,10 @@ export default {
         {
           label:'项目备注',
           value:this.mainData.projectnote
+        },
+        {
+          label:'退回原因',
+          value:this.mainData.backreason
         }
       ]
     },

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'http://192.168.3.9:8080',  // target host*!
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'http://192.168.3.9:8080',  // target host*!
           // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets