Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

# Conflicts:
#	src/HManagement/department/staff/detail/modules/restPassword.vue

src/HDrpManagement/orderManage/modules/add.vue

@@ -209,20 +209,16 @@ export default {
   methods:{
     async handleCommand (command) {
       this.form.type = command
-      if (command === '工具订单') {
-        const res = await this.$api.requested({
-          "id": 20221108111402,
-          "content":this.form
-        })
-        this.tool.showMessage(res,()=>{
-          this.$store.dispatch('changeDetailDrawer',true)
-          this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
-        })
-      } else {
-        this.drawer = true
-        this.specordermx()
-      }
-     
+      // const res = await this.$api.requested({
+      //   "id": 20221108111402,
+      //   "content":this.form
+      // })
+      // this.tool.showMessage(res,()=>{
+      //   this.$store.dispatch('changeDetailDrawer',true)
+      //   this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
+      // })
+      this.drawer = true
+      this.specordermx()
     },
     submitForm() {
       console.log(this.form)

src/HManagement/department/staff/detail/index.vue

@@ -20,6 +20,7 @@
         <restPas class="inline-16" :data="mainData"></restPas>
         <linkAccount class="inline-16" v-if="tool.checkAuth($route.name,'update')"  :data="mainData"  @onSuccess="queryMainData"></linkAccount>
         <createUser class="inline-16" v-if="tool.checkAuth($route.name,'update') && !mainData.userid" :data="mainData"  @onSuccess="queryMainData"></createUser>
+        <restPas v-if="tool.checkAuth($route.name,'restpas')" class="inline-16"></restPas>
       </div>
       <div class="container normal-panel" slot="slot0" >
         <baseInfo :mainInfo="mainData"></baseInfo>

src/HManagement/siteManage/messageSendtype/index copy.vue

@@ -1,71 +0,0 @@
-<template>
-  <div>
-    <div class="container normal-panel normal-margin">
-      <el-button size="small" type="warning" @click="updateSite_Parameter">保 存</el-button>
-    </div>
-    <div class="container normal-panel normal-margin">
-      <p class="normal-title normal-margin">消息提醒设置</p>
-      <div class="flex-align-center">
-        <div class="flex-align-center switch-panel">
-          <small>系统弹窗提醒&emsp;</small>
-          <el-switch
-            :active-value="1"
-            :inactive-value="0"
-            v-model="form.remind_showdialog">
-          </el-switch>
-        </div>
-        <div class="flex-align-center switch-panel">
-          <small>邮件提醒&emsp;</small>
-          <el-switch
-            :active-value="1"
-            :inactive-value="0"
-            v-model="form.remind_mail">
-          </el-switch>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-  data () {
-    return {
-      form:{}
-    }
-  },
-  computed:{
-  },
-  methods:{
-    async querySite_Parameter () {
-      const res = await this.$api.requested({
-        "classname": "webmanage.site.site",
-        "method": "querySite_Parameter",
-        "content": {
-        }
-      })
-      this.form = Object.assign({},this.form,res.data)
-    },
-    async updateSite_Parameter () {
-      const res = await this.$api.requested({
-        "classname": "webmanage.site.site",
-        "method": "updateSite_Parameter",
-        "content": this.form
-      })
-      this.tool.showMessage(res)
-    },
-  },
-  mounted () {
-    this.querySite_Parameter()
-  }
-}
-
-</script>
-<style>
-</style>
-<style scoped>
-.switch-panel{
-  width: 250px;
-}
-</style>

src/SDrpManagement/Products/index.vue

@@ -32,7 +32,7 @@ export default {
   components:{
     list,
     selectClass,
-    selectPeople
+    // selectPeople
   },
   methods:{
     selectClick (callback) {