diff --git a/api/charge.js b/api/charge.js
index b78699e..2a7490a 100644
--- a/api/charge.js
+++ b/api/charge.js
@@ -14,7 +14,7 @@ export const addMcVisit = data => http.post('/schsf/mcVisit/add',data)
 export const editMcVisit = data => http.post('/schsf/mcVisit/edit',data)
 /* 作废拜访 */
 export const cancelMcVisit = data => http.post('/schsf/mcVisit/cancel',data)
-/* 查询小区下拉树 */
+/* 查询项目公司下拉树 */
 export const getCompanyCascader = params => http.get('/schsf/mcBasicCmty/companyCascader', { params })
 /* 查询小区 */
 export const getVlgOrCmty = params => http.get('/schsf/mcBasicCmty/vlgOrCmty', { params })
diff --git a/api/chargeFile.js b/api/chargeFile.js
index a8a6a73..611307e 100644
--- a/api/chargeFile.js
+++ b/api/chargeFile.js
@@ -1,5 +1,4 @@
 //请求工具参考https://ext.dcloud.net.cn/plugin?id=392
-import request from '@/utils/request.js'
 import config from '@/common/config.js'
 
 
@@ -9,36 +8,38 @@ export function uploadFile(url) {
 		let a = uni.uploadFile({
 			url: `${config.baseUrl}/schsf/mcFile/upload`,
 			filePath: url,
-			name: 'files',
+			name: 'file',
 			formData: {},
 			header: {
 				Authorization: "Bearer " + uni.getStorageSync('ACCESS_TOKEN')
 			},
 			success: (res) => {
 				if (res.statusCode === 200) {
-					const data = JSON.parse(res.data)
+          console.log(res);
+					const data = JSON.parse(res.data);
+          console.log(data);
 					// console.log('上传成功,返回解析数据', data)
-					let uuid = uni.$u.guid(13)
-					let tempData = {
-						status:"success",
-						name: data.fileName,
-						size: data.size,
-						percentage: 100,
-						uid: uuid,
-						raw: {
-							uid: uuid
-						},
-						response: {
-							success: true,
-							fileId: data.fileId,
-							fileName:data.fileName,
-							size: data.size,
-							username: '超级管理员'
-						}
-					}
+					// let uuid = uni.$u.guid(13)
+					// let tempData = {
+					// 	status:"success",
+					// 	name: data.fileName,
+					// 	size: data.size,
+					// 	percentage: 100,
+					// 	uid: uuid,
+					// 	raw: {
+					// 		uid: uuid
+					// 	},
+					// 	response: {
+					// 		success: true,
+					// 		fileId: data.fileId,
+					// 		fileName:data.fileName,
+					// 		size: data.size,
+					// 		username: '超级管理员'
+					// 	}
+					// }
 					// let FileJson = JSON.stringify(tempData);
-					console.log("返回文件数据Json",tempData);
-					resolve(tempData)
+					// console.log("返回文件数据Json",data.data[0]);
+					resolve(data.data[0])
 				} else {
 					reject()
 				}
diff --git a/api/user.js b/api/user.js
index d6023e2..032deae 100644
--- a/api/user.js
+++ b/api/user.js
@@ -2,7 +2,7 @@
 const { http } = uni.$u
 
 //获取用户信息
-export const getUserInfo = params => http.get('/member/user/get', params)
+// export const getUserInfo = params => http.get('/member/user/get', params)
 //修改用户头像
 export const updateAvatar = filePath =>
   http.upload('/member/user/update-avatar', {
diff --git a/common/config.js b/common/config.js
index 9febfbe..8de31b6 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,7 +1,8 @@
 module.exports = {
   //后端接口地址
   // baseUrl: 'http://10.11.38.240:9001', //内网开发环境
-  baseUrl: 'http://192.168.0.8:8001', //内网开发环境
+  // baseUrl: 'http://192.168.0.8:8001', //内网开发环境
+  baseUrl: 'http://hqpnzc.natappfree.cc', //内网穿透开发环境
   // baseUrl: 'http://172.17.56.37:18082/api', //测试环境
   // baseUrl: 'http://172.17.56.16:18082/api', //ip正式环境
   // baseUrl: 'https://scdcapp.chinagasholdings.com/api', //域名正式环境
diff --git a/pages/charge/visitsAndFees/createaVisit.vue b/pages/charge/visitsAndFees/createaVisit.vue
index 808b9cf..81166cd 100644
--- a/pages/charge/visitsAndFees/createaVisit.vue
+++ b/pages/charge/visitsAndFees/createaVisit.vue
@@ -13,7 +13,7 @@
               v-if="item.type === 'date'">
               <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" disabled
                 disabledColor="#fff" border="none"></u-input>
-              <u-icon slot="right" name="calendar" size="20"></u-icon>
+              <u-icon slot="right" name="calendar" size="20" @click="handleDateTime(item)"></u-icon>
             </u-form-item>
             <!-- 输入类型 -->
             <u-form-item :required="item.required" :label="item.label" labelWidth="100" borderBottom
@@ -71,7 +71,8 @@
             <!-- 文件 -->
             <u-form-item :required="item.required" :label="item.label" labelWidth="75%" borderBottom
               v-if="item.type === 'file'">
-              <u-upload width="100rpx" height="100rpx"></u-upload>
+              <u-upload :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="10"
+                width="100rpx" height="100rpx"></u-upload>
             </u-form-item>
           </view>
         </view>
@@ -160,10 +161,17 @@
                 v-if="item.type === 'attachment'">
                 <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" disabled
                   disabledColor="#fff" border="none"></u-input>
-                <view slot="right" class="text-blue">上传附件</view>
+                <view slot="right" class="text-blue" @click="uploadAttachment">上传附件</view>
               </u-form-item>
               <view class="bg-gray">
-                上传内容
+                <view class="flex justify-between">
+                  <view class="padding" v-for="(item,index) in attachmentList" :key="index">
+                    {{item.fileName}}
+                  </view>
+                  <view class="">
+                    查看
+                  </view>
+                </view>
               </view>
             </view>
           </view>
@@ -174,14 +182,20 @@
       <u-button shape="circle" color="#CF000D">立即发起</u-button>
     </view>
 
-    <u-picker :show="pickerShow" closeOnClickOverlay :columns="columns" @cancel="pickerShow = false"
-      @close="pickerShow = false" keyName="label" @confirm="confirm"></u-picker>
+    <u-picker :show="pickerShow" ref="uPicker" closeOnClickOverlay :columns="columns" @cancel="pickerShow = false"
+      @close="pickerShow = false" keyName="label" @confirm="confirm" @change="changeHandler"></u-picker>
+
+    <u-datetime-picker :show="datetimeShow" v-model="dataTimeValue" @confirm="dateConfirm"
+      mode="datetime"></u-datetime-picker>
   </view>
 </template>
 
 <script>
+  import chargeFile from '@/api/chargeFile'
+  import config from '@/common/config.js'
   import {
-    getCurrentFiscalYear
+    getCurrentFiscalYear,
+    getCompanyCascader
   } from '@/api/charge.js'
   export default {
     components: {},
@@ -195,10 +209,20 @@
           fiscalYear: "",
           jobNature: "",
         },
+        copyModel: {},
         rules: {},
         pickerShow: false,
+        datetimeShow: false,
+        dataTimeValue: Number(new Date()),
         columns: [],
+        regionName: [],
+        groupName: [],
+        companyName: [],
+        companyCode: [],
         currentName: "", //弹窗后赋值name
+        companyOption: [],
+        fileList: [],
+        attachmentList:[],
         // 基本信息
         basisData: [{
           label: '财年',
@@ -226,11 +250,25 @@
           required: true,
           key: "entryTime"
         }, {
-          label: '项目公司/部门',
+          label: '区域',
           placeholder: "请选择",
           type: "select",
           required: true,
-          key: "companyCode"
+          key: "regionName"
+        },
+        {
+          label: '集团',
+          placeholder: "请选择",
+          type: "select",
+          required: true,
+          key: "groupName"
+        },
+        {
+          label: '公司',
+          placeholder: "请选择",
+          type: "select",
+          required: true,
+          key: "companyName"
         }, {
           label: '村(小区)',
           placeholder: "请选择",
@@ -280,62 +318,62 @@
           required: true,
           type: "select",
           key: "houseCondition",
-          dict:"sys_mc_visit_house"
+          dict: "sys_mc_visit_house"
         }, {
           label: '现用做饭能源',
           placeholder: "请选择",
           required: true,
           type: "select",
           key: "currentCookingEnergy",
-          dict:"sys_mc_visit_energy"
+          dict: "sys_mc_visit_energy"
         }, {
           label: '现用取暖能源',
           placeholder: "请选择",
           type: "select",
           key: "currentHeatingEnergy",
-          dict:"sys_mc_visit_energy"
+          dict: "sys_mc_visit_energy"
         }, {
           label: '家庭人口情况',
           placeholder: "请选择",
           type: "select",
           key: "familyMembers",
-          dict:"sys_mc_visit_members"
+          dict: "sys_mc_visit_members"
         }, {
           label: '电冰箱',
           placeholder: "请选择",
           type: "select",
           key: "fridgeStatus",
-          dict:'sys_mc_visit_appliance_status'
+          dict: 'sys_mc_visit_appliance_status'
         }, {
           label: '空调',
           placeholder: "请选择",
           type: "select",
           key: "acStatus",
-          dict:'sys_mc_visit_appliance_status'
+          dict: 'sys_mc_visit_appliance_status'
         }, {
           label: '电视',
           placeholder: "请选择",
           type: "select",
           key: "tvStatus",
-          dict:'sys_mc_visit_appliance_status'
+          dict: 'sys_mc_visit_appliance_status'
         }, {
           label: '洗衣机',
           placeholder: "请选择",
           type: "select",
           key: "washerStatus",
-          dict:'sys_mc_visit_appliance_status'
+          dict: 'sys_mc_visit_appliance_status'
         }, {
           label: '热水器',
           placeholder: "请选择",
           type: "select",
           key: "waterHeaterStatus",
-          dict:'sys_mc_visit_appliance_status'
+          dict: 'sys_mc_visit_appliance_status'
         }, {
           label: '光伏',
           placeholder: "请选择",
           type: "select",
           key: "pvSystemStatus",
-          dict:'sys_mc_visit_appliance_status'
+          dict: 'sys_mc_visit_appliance_status'
         }, {
           label: '当前地址',
           placeholder: "请输入",
@@ -344,7 +382,8 @@
         }, {
           label: '上传图片',
           placeholder: "请选择",
-          type: "file"
+          type: "file",
+          key: 'fieldPhotoFile'
         }],
         // 决策人信息
         decisionMakersData: [{
@@ -364,7 +403,7 @@
           required: true,
           type: "select",
           key: "dmIncomeSrc",
-          dict:'sys_mc_visit_dm_income'
+          dict: 'sys_mc_visit_dm_income'
         }, {
           label: '决策人联系方式',
           placeholder: "请输入",
@@ -408,14 +447,14 @@
           required: true,
           type: "select",
           key: "paymentMeth",
-          dict:'sys_mc_payment_meth',
+          dict: 'sys_mc_payment_meth',
         }, {
           label: '收费类型',
           placeholder: "请选择",
           required: true,
           type: "select",
           key: "chargeType",
-          dict:"sys_mc_charge_type"
+          dict: "sys_mc_charge_type"
         }],
         // 其他信息
         otherData: [{
@@ -437,34 +476,161 @@
       this.init()
     },
     methods: {
-      init() {
+      async init() {
         console.log(this.$store);
         // 查询财年
-        this.getCurrentFiscalYear()
-
+        await this.getCurrentFiscalYear()
+        await this.getCompanyCascader()
+        this.model.billingPersonName = uni.getStorageSync("nickName");
       },
       async getCurrentFiscalYear() {
         this.model.fiscalYear = (await getCurrentFiscalYear()).data;
         console.log("当前财年", this.model.fiscalYear);
       },
+      async getCompanyCascader() {
+        this.companyOption = (await getCompanyCascader()).data;
+        console.log("当前公司类", this.companyOption);
+      },
       // 选择弹出层
       handleSelect(item) {
         console.log(item);
-        let dict = item.dict;
-        let dictArr = this.getDictDatas(dict);
-        this.currentName = item.key;
-        this.columns = [dictArr];
-        // console.log("字典数组", dictArr);
+        if (item.key === 'companyCode') {
+          this.companyOption.forEach(item1 => {
+            // console.log(111,item1);
+            this.regionName.push(item1);
+            item1.children.forEach(item2 => {
+              // console.log(222,item2);
+              this.groupName.push(item2);
+              item2.children.forEach(item3 => {
+                // console.log(333,item3);
+                this.companyName.push(item3);
+              });
+            });
+          });
+          // console.log("data1", data1);
+          // console.log("data2", data2);
+          // console.log("data3", data3);
+          this.columns = [this.regionName, this.groupName, this.companyName];
+          console.log("数据", this.columns);
+        } else {
+          let dict = item.dict;
+          let dictArr = this.getDictDatas(dict);
+          this.currentName = item.key;
+          this.columns = [dictArr];
+        }
         this.pickerShow = true;
+        console.log(this.columns);
+        // console.log("字典数组", dictArr);
       },
-      // 弹出层确认
+      // 选择弹出层确认
       confirm(e) {
         console.log("确认", e);
         this.model[this.currentName] = e.value[0].value;
         this.pickerShow = false;
       },
+      // 选择时间弹出层
+      handleDateTime(item) {
+        this.currentName = item.key;
+        this.datetimeShow = true;
+        console.log(item);
+      },
+      // 时间弹出层确认
+      dateConfirm(e) {
+        let time = this.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss');
+        console.log("选择时间", time);
+        this.model[this.currentName] = time;
+        this.datetimeShow = false;
+      },
+      changeHandler(e) {
+        console.log(e);
+        const {
+          columnIndex,
+          value,
+          values, // values为当前变化列的数组内容
+          index,
+          // 微信小程序无法将picker实例传出来，只能通过ref操作
+          picker = this.$refs.uPicker
+        } = e
+        // 当第一列值发生变化时，变化第二列(后一列)对应的选项
+        // if (columnIndex === 0) {
+        //   // picker为选择器this实例，变化第二列对应的选项
+        //   picker.setColumnValues(1, this.groupName[index])
+        // }
+      },
+      // 删除图片
+      deletePic(event) {
+        this.fileList.splice(event.index, 1)
+      },
+      // 新增图片
+      async afterRead(event) {
+        // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+        let lists = [].concat(event.file)
+        let fileListLen = this.fileList.length
+        lists.map((item) => {
+          this.fileList.push({
+            ...item,
+            status: 'uploading',
+            message: '上传中'
+          })
+        })
+        for (let i = 0; i < lists.length; i++) {
+          const result = await this.uploadFilePromise(lists[i].url)
+          let item = this.fileList[fileListLen]
+          this.fileList.splice(fileListLen, 1, Object.assign(item, {
+            status: 'success',
+            message: '',
+            uuid: result.uuid,
+            url: result
+          }))
+          fileListLen++
+        }
+        console.log(this.fileList);
+      },
+      uploadFilePromise(url) {
+        return new Promise((resolve, reject) => {
+          let a = uni.uploadFile({
+            url: `${config.baseUrl}/schsf/mcFile/upload`,
+            filePath: url,
+            name: 'file',
+            header: {
+              Authorization: "Bearer " + uni.getStorageSync('ACCESS_TOKEN')
+            },
+            success: (res) => {
+              console.log("上传结果", res);
+              setTimeout(() => {
+                if (res.statusCode === 200) {
+                  let data = JSON.parse(res.data);
+                  console.log("上传data", data.data[0]);
+                  resolve(data.data[0])
+                }
+              }, 500)
+            }
+          });
+        })
+      },
+      async uploadAttachment() {
+        console.log("上传附件");
+        uni.chooseFile({
+          count: 1, //默认100
+         extension:['.doc','.xlsx','.docx'],
+        	success:async (res)=> {
+            let tempUrl = res.tempFilePaths[0]
+            console.log(res);
+            const result = await chargeFile.uploadFile(tempUrl);
+            this.attachmentList.push(result);
+            console.log(result);
+        	}
+        });
+      },
+      // 重构提交数据，不影响表单数据
+      copyMethods() {
+        this.copyModel.fieldPhotoFile = this.fileList.map(item => item.uuid).join(",");
+      },
+      // 发起拜访
       handleConfirm() {
-        console.log('提交数据', JSON.parse(JSON.stringify(this.model)));
+        this.copyModel = this.model;
+        this.copyMethods();
+        console.log('提交数据', JSON.parse(JSON.stringify(this.copyModel)));
         this.$modal.confirm('确认发起当前这条记录?', '温馨提示').then(() => {
           console.log('确定');
         }).catch(() => {
diff --git a/store/mudules/user.js b/store/mudules/user.js
index b2ad474..0343640 100644
--- a/store/mudules/user.js
+++ b/store/mudules/user.js
@@ -54,6 +54,7 @@ const user = {
       state.roleId = roleIdString;
       state.entity = entityString;
       state.entityName = entityNameString;
+      uni.setStorageSync('nickName', sysUser.nickName)
       uni.setStorageSync('roleId', roleIdString)
       uni.setStorageSync('entity', entityString)
       uni.setStorageSync('entityName', entityNameString)
--
libgit2 0.21.2