From 993fe19e7df842e93202cb324241e38dd2488a68 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 13 Jul 2022 13:42:53 +0800
Subject: [PATCH] no message

---
 apis/commonApi.js                 | 20 +++++----
 apis/enterpriseInfoApi.js         | 21 ++++++++++
 pages/digital-workshops/index.vue | 61 +++++++++++++++++----------
 pages/employee-detail/index.vue   | 62 ++++++++++++++++++++-------
 pages/employee-manage/index.vue   | 70 +++++--------------------------
 pages/mine/index.vue              |  2 +-
 store/index.js                    | 20 ++++-----
 7 files changed, 140 insertions(+), 116 deletions(-)

diff --git a/apis/commonApi.js b/apis/commonApi.js
index ef0bd31..df55430 100644
--- a/apis/commonApi.js
+++ b/apis/commonApi.js
@@ -28,13 +28,19 @@ let baseInfo = null
 
 // 处理store同步问题
 function syncStore(res) {
-  if (res.enterpriseList && res.enterpriseList.length > 0) {
-    let company = res.enterpriseList[0]
+  if (res.organizationList && res.organizationList.length > 0) {
+	let company = null
+	let organization = null
+	for (var i = 0; i < res.organizationList.length; i++) {
+		if(res.organizationList[i].factoryList && res.organizationList[i].factoryList.length){
+			company = res.organizationList[i].factoryList[0]
+			organization = res.organizationList[i]
+			break
+		}
+	}
     store.commit('setCompanyInfo', {
       id: company.id,
-      name: company.name,
-      fddEnterpriseStatus: company.fddEnterpriseStatus,
-      enterpriseType: company.enterpriseType
+      name: company.name
     })
 	res.name = company.employeeName
 	res.avatar = null
@@ -44,8 +50,8 @@ function syncStore(res) {
       mobile: res.mobile,
       avatar: null
     }
-	uni.setStorageSync('factoryId', company.factoryList[0].id)
-	uni.setStorageSync('organizationId', company.organizationId)
+	uni.setStorageSync('factoryId', company.id)
+	uni.setStorageSync('organizationId', organization.organizationId)
     store.commit('setUserInfo', res)
     // 根据企业类型切换tabbar
   } else {
diff --git a/apis/enterpriseInfoApi.js b/apis/enterpriseInfoApi.js
index 620de7a..2d0221e 100644
--- a/apis/enterpriseInfoApi.js
+++ b/apis/enterpriseInfoApi.js
@@ -69,3 +69,24 @@ export const auditMember = (data) => {
     data
   })
 }
+
+export const getMemberInfo = (data) => {
+  return http.get({
+    url: '/printing-packaging-factory-service/user/get/organization-member-detail',
+    data
+  })
+}
+
+export const deleteMember = (data) => {
+  return http.post({
+    url: '/printing-packaging-factory-service/user/delete/organization-member',
+    data
+  })
+}
+
+export const updateMember = (data) => {
+  return http.post({
+    url: '/printing-packaging-factory-service/user/update/organization-member',
+    data
+  })
+}
\ No newline at end of file
diff --git a/pages/digital-workshops/index.vue b/pages/digital-workshops/index.vue
index 50e74bd..599ccc2 100644
--- a/pages/digital-workshops/index.vue
+++ b/pages/digital-workshops/index.vue
@@ -174,19 +174,22 @@ export default {
     }
   },
   onLoad() {
+	this.factoryId = uni.getStorageSync('factoryId')
     this.getFactoryList()
   },
   onPullDownRefresh() {
-    this.getFactoryList()
+    // this.getFactoryList()
     uni.stopPullDownRefresh()
   },
   watch: {
     factoryId(val, oldVal) {
 	  uni.setStorageSync('factoryId', this.factoryId)
-      this.getCameraList()
-      this.getList()
-	  this.downCallback()
-      this.isExample = this.factoryList.find((factory) => factory.value == val).isExample
+	  if(this.factoryId){
+		  this.getCameraList()
+		  this.getList()
+		  this.downCallback()
+		  this.isExample = this.factoryList.find((factory) => factory.value == val).isExample
+	  }
     },
     refresh(val) {
       console.log('refresh', val)
@@ -299,9 +302,9 @@ export default {
     },
     // 获取摄像头列表
     getCameraList() {
-      // getCameraListApi({ factoryId: this.factoryId }).then((res) => {
-      //   this.cameraList = res
-      // })
+		if(!this.factoryId){
+			this.factoryId = uni.getStorageSync('factoryId')
+		}
 	  var url = `https://api-ops-yyt.qniao.cn/cloud-print-cloud-factory/user/get/factory/video-machine/list?factoryId=${this.factoryId}`
 	  http.get({ url }).then(res => {
 		if(res){
@@ -311,20 +314,34 @@ export default {
     },
     // 获取工厂列表
     getFactoryList() {
-      getMyFactoryList().then((res) => {
-        this.factoryList = res.map((item) => {
-          return {
-            label: item.name,
-            value: item.id,
-            isExample: item.name == '演示样板工厂'
-          }
-        })
-        if (this.factoryId == this.factoryList[0].value) {
-          this.getCameraList()
-          this.getList()
-        }
-        this.factoryId = this.factoryList[0].value
-      })
+		let factoryList = []
+		var organizationList = this.$store.state.userInfo.organizationList
+		for (var i = 0; i < organizationList.length; i++) {
+			if(!organizationList[i].factoryList || !organizationList[i].factoryList.length){
+				continue
+			}
+			for (var k = 0; k < organizationList[i].factoryList.length; k++) {
+				factoryList.push({label: organizationList[i].factoryList[k].name, value: organizationList[i].factoryList[k].id})
+			}
+		}
+		factoryList.push({label: '演示样板工厂', id: '683736272371585025', isExample: true})
+		this.factoryList = factoryList
+		this.getCameraList()
+		this.getList()
+      // getMyFactoryList().then((res) => {
+      //   this.factoryList = res.map((item) => {
+      //     return {
+      //       label: item.name,
+      //       value: item.id,
+      //       isExample: item.name == '演示样板工厂'
+      //     }
+      //   })
+      //   if (this.factoryId == this.factoryList[0].value) {
+      //     this.getCameraList()
+      //     this.getList()
+      //   }
+      //   this.factoryId = this.factoryList[0].value
+      // })
     },
 	dateTimeFormat,
 	fetchOrderList() {
diff --git a/pages/employee-detail/index.vue b/pages/employee-detail/index.vue
index 34e7a73..b086c07 100644
--- a/pages/employee-detail/index.vue
+++ b/pages/employee-detail/index.vue
@@ -10,7 +10,7 @@
         <qn-easyinput
           :maxlength="20"
           @blur="showCompany"
-          v-model="form.receiver"
+          v-model="form.name"
           :inputBorder="false"
           text="left"
           placeholder="请填写员工姓名"
@@ -23,7 +23,7 @@
         <qn-easyinput
           :maxlength="11"
           type="number"
-          v-model="form.receiverMobile"
+          v-model="form.mobile"
           :inputBorder="false"
           text="left"
           placeholder="请填写手机号码"
@@ -37,7 +37,7 @@
 				<uni-data-checkbox mode="tag" multiple v-model="flag" :localdata="[{text: '全部',value: 1}]" @change="onChange()"></uni-data-checkbox>
 			</view>
 		</view>
-		<uni-data-checkbox mode="button" multiple v-model="checkIds" :localdata="hobby" @change="onChange2()"></uni-data-checkbox>
+		<uni-data-checkbox mode="button" multiple v-model="machineIds" :localdata="hobby" @change="onChange2()"></uni-data-checkbox>
 	</view>
     <view class="default-address">
       <view class="title">状态：</view>
@@ -49,6 +49,7 @@
 	<view class="button-area" style="margin-top: 36rpx;">
 	  <view class="button button__submit" @click="addTap"><text class="text" style="color: white">保存</text></view>
 	</view>
+	<view style="height: 48rpx;"></view>
 	<uni-popup ref="popup" type="center" :mask-click="false">
 	  <view class="popup-box">
 	    <view class="tip-title">确定要删除该员工吗？</view>
@@ -65,18 +66,19 @@
 <script>
 import { getMachinList } from '@/apis/factoryApi'
 import { back } from '@/utils/hook.js'
-import { createAddress, getAddressDetail } from '@/apis/addressManageApi.js'
+import { deleteMember, getMemberInfo, updateMember } from '@/apis/enterpriseInfoApi.js'
 export default {
   data() {
     return {
       form: {
-		  
+		name: '',
+		mobile: ''  
 	  },
       id: null,
 	  hobby: [],
-	  checkIds: [],
+	  machineIds: [],
 	  flag: [],
-	  radio: []
+	  radio: 0
     }
   },
   mounted() {
@@ -94,17 +96,24 @@ export default {
   onLoad(option) {
     if (option.id) {
       this.id = option.id
-      this.getAddressDetail()
+      this.getDetail()
     }
   },
   methods: {
     back,
     // 通过id查询收货地址
-    getAddressDetail() {
-      getAddressDetail({ id: this.id }).then((res) => {
-        // console.log('收货地址详情', res)
+    getDetail() {
+      getMemberInfo({ orgMemberId: this.id }).then((res) => {
         if (res) {
           this.form = Object.assign({}, res)
+		  if (res.machineList && res.machineList.length) {
+			  var checks = []
+			  for (let i = 0; i < res.machineList.length; i++) {
+			  	checks.push(res.machineList[i].id)
+			  }
+			  this.machineIds = checks
+		  }
+		  this.radio = res.status ? 1 : 0
         }
       })
     },
@@ -114,13 +123,14 @@ export default {
 			for (let i = 0; i < this.hobby.length; i++) {
 				checks.push(this.hobby[i].value)
 			}
-			this.checkIds = checks
+			
+			this.machineIds = checks
 		} else {
-		    this.checkIds = []	
+		    this.machineIds = []	
 		}
 	},
 	onChange2(){
-		if(this.checkIds.length == this.hobby.length){
+		if(this.machineIds.length == this.hobby.length){
 			this.flag = [1]
 		} else {
 		    this.flag = []	
@@ -128,7 +138,19 @@ export default {
 	},
     // 保存
     addTap() {
-      console.log(this.checkIds)
+	  var params = {id : this.form.id}
+	  params.realName = this.form.name
+	  params.machineIds = this.machineIds
+	  params.status = this.radio ? true : false
+	  updateMember(params).then((res) => {
+	    if (res) {
+	  	  uni.$emit('employee',{msg:'页面更新'})
+	      uni.showToast({ title: '保存成功', icon: 'success' })
+	      setTimeout(() => {
+	        back()
+	      }, 500)
+	    }
+	  })
     },
 	delTap(){
 		this.$refs.popup.open('center')
@@ -137,7 +159,15 @@ export default {
 	  this.$refs.popup.close()
 	},
 	confirmTap(){
-		uni.$emit('employee',{msg:'页面更新'})
+		deleteMember({idList: [this.form.id]}).then((res) => {
+		  if (res) {
+			uni.$emit('employee',{msg:'页面更新'})
+		    uni.showToast({ title: '删除成功', icon: 'success' })
+		    setTimeout(() => {
+		      back()
+		    }, 500)
+		  }
+		})
 	}
   }
 }
diff --git a/pages/employee-manage/index.vue b/pages/employee-manage/index.vue
index 49a3031..12ae121 100644
--- a/pages/employee-manage/index.vue
+++ b/pages/employee-manage/index.vue
@@ -35,16 +35,6 @@
 		<uni-icons type="plusempty" size="36" color="white"></uni-icons>
 	  </view>
 	</view>
-    <uni-popup ref="popup" type="center" :mask-click="false">
-      <view class="popup-box">
-        <view class="tip-title">确定要删除改地址吗？</view>
-        <view class="operation-row">
-          <view class="cancel-text" @tap="cancelTap">取消</view>
-          <view class="line"></view>
-          <view class="confirm-text" @tap="confirmTap">确定</view>
-        </view>
-      </view>
-    </uni-popup>
   </view>
 </template>
 
@@ -84,7 +74,7 @@ export default {
     go2,
     back,
 	onEvent(e) {
-		
+		this.queryData()
 	},
     queryData() {
       getMemberList({id: this.organization.organizationId}).then((res) => {
@@ -101,30 +91,19 @@ export default {
 	  })
     },
 	findOrgByFactoryId(factoryId){
-		var enterpriseList = this.$store.state.userInfo.enterpriseList
-		for (var i = 0; i < enterpriseList.length; i++) {
-			for (var k = 0; i < enterpriseList[i].factoryList.length; k++) {
-				if(enterpriseList[i].factoryList[k].id == factoryId){
-					return enterpriseList[i]
+		var organizationList = this.$store.state.userInfo.organizationList
+		console.log(organizationList)
+		for (var i = 0; i < organizationList.length; i++) {
+			if(!organizationList[i].factoryList || !organizationList[i].factoryList.length){
+				continue
+			}
+			for (var k = 0; k < organizationList[i].factoryList.length; k++) {
+				if(organizationList[i].factoryList[k].id == factoryId){
+					return organizationList[i]
 				}
 			}
 		}
 	},
-    // 设置默认地址
-    radioTap(item) {
-      setDefaultAddress({ id: item.id }).then((res) => {
-        if (res) {
-          this.queryData()
-        }
-      })
-    },
-    // 选择地址
-    selectAddress(item) {
-      if (this.operation === 'select') {
-        setCache('address', item)
-        back()
-      }
-    },
 	handItem(item, status) {
 	  auditMember({ id: item.id, status }).then((res) => {
 	    if (res) {
@@ -134,35 +113,6 @@ export default {
 	},
     lookItem(item) {
       go2('employee-detail', { id: item.id })
-    },
-    // 新增收货地址
-    addTap() {
-      go2('add-address-manage', { type: '新增地址' })
-    },
-    // 删除
-    delTap(item, index) {
-      this.id = item.id
-      this.$refs.popup.open('center')
-      // this.$refs.popup.close()
-    },
-    // 编辑
-    editTap(item, index) {
-      go2('add-address-manage', { id: item.id, type: '编辑地址' })
-    },
-    confirmTap() {
-      delAddress({ id: this.id }).then((res) => {
-        this.$refs.popup.close()
-        if (res) {
-          uni.showToast({
-            title: '删除成功',
-            icon: 'success'
-          })
-          this.queryData()
-        }
-      })
-    },
-    cancelTap() {
-      this.$refs.popup.close()
     },
 	shareminiProgram(){
 		uni.share({
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 96fde34..902a7b9 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -33,7 +33,7 @@
         </view> -->
       </view>
     </view>
-    <view class="card-area" v-if="hasCompany">
+    <view class="card-area">
       <view class="header">
         <text style="font-size: 30rpx; color: rgba(0, 0, 0, 0.85); font-weight: 600">我的设备</text>
       </view>
diff --git a/store/index.js b/store/index.js
index dfb9d75..2c36797 100644
--- a/store/index.js
+++ b/store/index.js
@@ -106,16 +106,16 @@ if (!store) {
         }
       },
       setUserInfo(state, userInfo) {
-        if (!isObject(userInfo)) {
-          console.warn('userInfo必须是对象')
-          return
-        }
-        for (let param of userInfoParams) {
-          if (userInfo[param] === undefined) {
-            console.warn('userInfo必须包含' + param + '属性')
-            return
-          }
-        }
+        // if (!isObject(userInfo)) {
+        //   console.warn('userInfo必须是对象')
+        //   return
+        // }
+        // for (let param of userInfoParams) {
+        //   if (userInfo[param] === undefined) {
+        //     console.warn('userInfo必须包含' + param + '属性')
+        //     return
+        //   }
+        // }
         try {
           uni.setStorageSync('userInfo', JSON.stringify(userInfo))
           state.userInfo = userInfo