fix:修改创建客户所在地区的传参错误的问题，删除冗余代码

components/FormList/index.vue

@@ -81,12 +81,9 @@
       getData() {
         let result = []
         this.dataList.map((item) => {
-          console.log(item)
           const { open, ...items } = item
-          console.log({ ...items })
           result.push({ ...items })
         })
-        console.log(result)
       },
     },
     components: {},

components/SelectProduct.vue

@@ -2,9 +2,9 @@
  * @Author: liuzhenlin 461480418@qq.ocm
  * @Date: 2023-02-15 10:34:49
  * @LastEditors: liuzhenlin
- * @LastEditTime: 2023-02-20 18:20:37
+ * @LastEditTime: 2023-03-27 16:58:46
  * @Description: file content
- * @FilePath: \frontend_mobile\components\SelectProduct.vue
+ * @FilePath: \oms\components\SelectProduct.vue
 -->
 <template>
   <view>
@@ -56,6 +56,11 @@
   import to from 'await-to-js'
   export default {
     name: 'OmsCustomerContact',
+    props: {
+      selectedRows: {
+        default: () => [],
+      },
+    },
     data() {
       return {
         selectVisible: false,
@@ -80,12 +85,15 @@
         if (err) return
         if (res.code == 200) {
           if (res.data.list && res.data.list.length > 0) {
-            this.checkboxList = res.data.list.map((item) => ({
-              ...item,
-              label: `${item.prodName}/${item.prodClass}/${item.prodCode}`,
-              ischeck: false,
-              prodNum: '1',
-            }))
+            this.checkboxList = res.data.list.map((itemA) => {
+              const itemB = this.selectedRows.find((itemB) => itemB.id === itemA.id)
+              return {
+                ...itemA,
+                label: `${itemA.prodName}/${itemA.prodClass}/${itemA.prodCode}`,
+                prodNum: '1',
+                ischeck: Boolean(itemB),
+              }
+            })
           } else {
             this.checkboxList = []
           }

components/SelectUser.vue

@@ -87,7 +87,6 @@
       },
       close() {
         this.selectVisible = false
-        console.log(this.selected)
         this.$emit('close', this.selected)
       },
       radioChange(n) {

pages/contract/components/contractDetail.vue

@@ -161,7 +161,6 @@
     },
 
     mounted() {
-      // console.log(this.abstract)
     },
 
     methods: {},

pages/contract/components/contractDynamics.vue

@@ -54,7 +54,6 @@
 
     mounted() {
       this.fetchData()
-      // console.log('contractId', this.contractId)
     },
 
     methods: {

pages/contract/index.vue

@@ -186,9 +186,6 @@
       },
       // 上拉滚动
       lower() {
-        // console.log(this.list.length)
-        // console.log(this.customerDataTotal)
-        // console.log(this.loadStatus)
         if (this.list.length < this.customerDataTotal && this.loadStatus != 'loading') {
           this.$u.throttle(this.fetchData(), 2000, false)
         }
@@ -221,7 +218,6 @@
           }
           this.customerDataTotal = res.data.total
           this.loadStatus = this.list.length == this.customerDataTotal ? 'nomore' : 'loadmore'
-          // console.log(this.loadStatus)
         } else {
           this.loadStatus = 'nomore'
         }

pages/contract/invoice.vue

@@ -110,7 +110,6 @@
       this.getOptions()
     },
     onLoad(option) {
-      // console.log(option.id) //打印出上个页面传递的参数。
       this.form.contractId = parseInt(option.id)
       this.form.contractCode = option.code
     },
@@ -143,7 +142,6 @@
         params.invoiceAmount = parseInt(params.invoiceAmount)
         this.$refs.form.validate().then(async valid => {
           if (valid) {
-            // console.log(valid);
             const [err, res] = await to(api.addInvoice(params))
             if (err) return
             this.$refs.uToast.show({

pages/customer/add.vue

@@ -12,7 +12,7 @@
       <view :style="{ paddingTop }">
         <view class="title" :style="[{ height }, { lineHeight: height }]">
           <view class="back" @click="goBack()">
-            <u-icon name="arrow-left" color="#ffffff" size="22"></u-icon>
+            <u-icon custName="arrow-left" color="#ffffff" size="22"></u-icon>
           </view>
           <text>新增客户</text>
         </view>
@@ -20,34 +20,22 @@
     </view>
     <view class="main">
       <u-form :model="addForm" :rules="rules" ref="addForm" label-width="0">
-        <u-form-item prop="name" borderBottom customStyle="padding:40rpx 0 30rpx">
+        <u-form-item prop="custName" borderBottom customStyle="padding:40rpx 0 30rpx">
           <view class="form-label flex_l">
             <view class="label-tag"></view>
             客户名称
           </view>
-          <u-input
-            placeholder="输入客户名称"
-            v-model="addForm.name"
-            border="none"
-            suffixIcon="account"
-            suffixIconStyle="color:#CDCDCD"
-            clearable
-            customStyle="padding: 0 30rpx 0 12rpx"></u-input>
+          <u-input placeholder="输入客户名称" v-model="addForm.custName" border="none" suffixIcon="account"
+            suffixIconStyle="color:#CDCDCD" clearable customStyle="padding: 0 30rpx 0 12rpx"></u-input>
         </u-form-item>
         <u-form-item prop="industry" borderBottom customStyle="padding:40rpx 0 30rpx" @click="showIndustry = true">
           <view class="form-label flex_l">
             <view class="label-tag"></view>
             客户行业
           </view>
-          <u-input
-            :readonly="true"
-            placeholder="请选择客户行业"
-            v-model="addForm.industry"
-            border="none"
-            suffixIcon="arrow-down"
-            suffixIconStyle="color:#CDCDCD"
-            clearable
-            customStyle="padding: 0 30rpx 0 12rpx"></u-input>
+          <u-input :readonly="true" placeholder="请选择客户行业" v-model="addForm.industry" border="none"
+            suffixIcon="arrow-down" suffixIconStyle="color:#CDCDCD" clearable customStyle="padding: 0 30rpx 0 12rpx">
+          </u-input>
         </u-form-item>
         <!-- <u-form-item prop="level" borderBottom customStyle="padding:40rpx 0 30rpx" @click="showLevel = true">
           <view class="form-label flex_l">
@@ -69,51 +57,30 @@
             <view class="label-tag"></view>
             客户来源
           </view>
-          <u-input
-            :readonly="true"
-            placeholder="请选择客户来源"
-            v-model="addForm.custSource"
-            border="none"
-            suffixIcon="arrow-down"
-            suffixIconStyle="color:#CDCDCD"
-            clearable
-            customStyle="padding: 0 30rpx 0 12rpx"></u-input>
+          <u-input :readonly="true" placeholder="请选择客户来源" v-model="addForm.custSource" border="none"
+            suffixIcon="arrow-down" suffixIconStyle="color:#CDCDCD" clearable customStyle="padding: 0 30rpx 0 12rpx">
+          </u-input>
         </u-form-item>
         <u-form-item prop="area" borderBottom customStyle="padding:40rpx 0 30rpx" @click="showArea = true">
           <view class="form-label flex_l">
             <view class="label-tag"></view>
             所在地区
           </view>
-          <u-input
-            :readonly="true"
-            placeholder="请选择所在地区"
-            v-model="addForm.area"
-            border="none"
-            suffixIcon="arrow-down"
-            suffixIconStyle="color:#CDCDCD"
-            clearable
-            customStyle="padding: 0 30rpx 0 12rpx"></u-input>
+          <u-input :readonly="true" placeholder="请选择所在地区" v-model="addForm.area" border="none" suffixIcon="arrow-down"
+            suffixIconStyle="color:#CDCDCD" clearable customStyle="padding: 0 30rpx 0 12rpx"></u-input>
         </u-form-item>
         <u-form-item borderBottom customStyle="padding:40rpx 0 30rpx">
           <view class="form-label flex_l">
             备注
           </view>
-          <u-input
-            placeholder="输入备注"
-            v-model="addForm.remark"
-            border="none"
-            clearable
+          <u-input placeholder="输入备注" v-model="addForm.remark" border="none" clearable
             customStyle="padding: 0 30rpx 0 12rpx"></u-input>
         </u-form-item>
       </u-form>
       <view class="save" @click="handleAdd">保存</view>
     </view>
     <!-- 选择客户行业 -->
-    <u-picker
-      :show="showIndustry"
-      :columns="industryColumns"
-      keyName="value"
-      @cancel="showIndustry = false"
+    <u-picker :show="showIndustry" :columns="industryColumns" keyName="value" @cancel="showIndustry = false"
       @confirm="pickIndustry"></u-picker>
     <!-- 选择客户级别 -->
     <!-- <u-picker
@@ -123,26 +90,12 @@
       @cancel="showLevel = false"
       @confirm="pickLevel"></u-picker> -->
     <!-- 选择客户来源 -->
-    <u-picker
-      :show="showSource"
-      :columns="sourceColumns"
-      keyName="value"
-      @cancel="showSource = false"
+    <u-picker :show="showSource" :columns="sourceColumns" keyName="value" @cancel="showSource = false"
       @confirm="pickSource"></u-picker>
     <!-- 选择地区 -->
-    <u-picker
-      :show="showArea"
-      @cancel="showArea = false"
-      @close="showArea = false"
-      :columns="addressColumns"
-      @confirm="localConfirm"
-      title="请选择所在地"
-      keyName="distName"
-      itemHeight="80"
-      closeOnClickOverlay
-      ref="areaPicker"
-      @change="changeHandler"
-      immediateChange></u-picker>
+    <u-picker :show="showArea" @cancel="showArea = false" @close="showArea = false" :columns="addressColumns"
+      @confirm="localConfirm" title="请选择所在地" keyName="distName" itemHeight="80" closeOnClickOverlay ref="areaPicker"
+      @change="changeHandler" immediateChange></u-picker>
     <u-notify ref="uNotify"></u-notify>
     <u-toast ref="uToast"></u-toast>
   </view>
@@ -168,19 +121,25 @@
         areaLoading: false,
         areaColumns: [], //省份数据
         addressColumns: [], //数据数组
-        selectLocation: null, //选中的省市区信息
         addForm: {
-          name: '', //客户姓名
+          custName: '', //客户姓名
           industry: '', //行业
           industryId: null,
           // level: '', //级别
           // levelId: null,
           custSource: '', //来源
           custSourceId: null,
+          area: "",
+          CustProvinceId: null, //省
+          CustProvince: '',
+          CustCityId: null, //市
+          CustCity: '',
+          CustRegionId: null, //区、县
+          CustRegion: '',
           remark: '', //备注
         },
         rules: {
-          name: {
+          custName: {
             type: 'string',
             required: true,
             message: '请填写客户名称',
@@ -225,11 +184,11 @@
       // 获取字典数据
       getOptions() {
         Promise.all([
-          distrApi.getProvinceInfo(), //省市区
-          // this.getDicts('cust_level'), //级别
-          this.getDicts('cust_idy'), //行业
-          this.getDicts('cust_source'), //来源
-        ])
+            distrApi.getProvinceInfo(), //省市区
+            // this.getDicts('cust_level'), //级别
+            this.getDicts('cust_idy'), //行业
+            this.getDicts('cust_source'), //来源
+          ])
           .then(([province, industry, source]) => {
             this.areaColumns = province.data.list || []
             // this.levelColumns = [level.data.values] || []
@@ -263,15 +222,24 @@
         let shi = []
         let qu = []
         this.areaColumns.forEach((item) => {
-          sheng.push({ distName: item.distName, id: item.id })
+          sheng.push({
+            distName: item.distName,
+            id: item.id
+          })
           // 设置初始化的数据
           if (item.distName == '北京市') {
             item.children.forEach((child) => {
-              shi.push({ distName: child.distName, id: child.id })
+              shi.push({
+                distName: child.distName,
+                id: child.id
+              })
 
               if (child.distName == '北京市') {
                 child.children.forEach((el) => {
-                  qu.push({ distName: el.distName, id: el.id })
+                  qu.push({
+                    distName: el.distName,
+                    id: el.id
+                  })
                 })
               }
             })
@@ -302,20 +270,25 @@
                 let shi = []
                 let flag = item.children[0].distName
                 item.children.forEach((val, ol) => {
-                  shi.push({ distName: val.distName, id: val.id })
+                  shi.push({
+                    distName: val.distName,
+                    id: val.id
+                  })
                   if (shi[0].distName == flag) {
                     //设置默认开关（选择省份后设置默认城市）
                     flag = ''
                     let qu = []
                     val.children.forEach((vol) => {
-                      qu.push({ distName: vol.distName, id: vol.id })
+                      qu.push({
+                        distName: vol.distName,
+                        id: vol.id
+                      })
                     })
                     picker.setColumnValues(2, qu)
                   }
                 })
                 picker.setColumnValues(1, shi)
               } else {
-                // console.log(item)
                 picker.setColumnValues(1, [])
                 picker.setColumnValues(2, [])
               }
@@ -328,11 +301,17 @@
             if (value[0].distName == item.distName) {
               let shi = []
               item.children.forEach((val, ol) => {
-                shi.push({ distName: val.distName, id: val.id })
+                shi.push({
+                  distName: val.distName,
+                  id: val.id
+                })
                 if (value[1].distName == val.distName) {
                   let qu = []
                   val.children.forEach((vol) => {
-                    qu.push({ distName: vol.distName, id: vol.id })
+                    qu.push({
+                      distName: vol.distName,
+                      id: vol.id
+                    })
                   })
                   picker.setColumnValues(2, qu)
                 }
@@ -343,10 +322,16 @@
       },
       // 确认选中的数据
       localConfirm(e) {
-        this.selectLocation = e
-        this.addForm.area = e.value[1]
-          ? e.value[0].distName + e.value[1].distName + e.value[2].distName
-          : e.value[0].distName
+        if (e.value[1]) {
+          this.addForm.CustProvinceId = e.value[0].id
+          this.addForm.CustProvince = e.value[0].distName
+          this.addForm.CustCityId = e.value[1].id
+          this.addForm.CustCity = e.value[1].distName
+          this.addForm.CustRegionId = e.value[2].id
+          this.addForm.CustRegion = e.value[2].distName
+          this.addForm.area = e.value[0].distName + e.value[1].distName + e.value[2].distName
+        }
+
         this.showArea = false
       },
       handleAdd() {
@@ -354,16 +339,17 @@
           .validate()
           .then(async () => {
             let params = {
-              custName: this.addForm.name,
-              custIndustry: this.addForm.industry,
-              // custLevel: this.addForm.level,
-              custIndustry: this.addForm.industry,
+              custName: this.addForm.custName,
+              custIndustry: this.addForm.industryId,
               custSource: this.addForm.custSourceId,
-              custLocation: this.addForm.area,
+              CustProvinceId: this.addForm.CustProvinceId,
+              CustProvince: this.addForm.CustProvince,
+              CustCityId: this.addForm.CustCityId,
+              CustCity: this.addForm.CustCity,
+              CustRegionId: this.addForm.CustRegionId,
+              CustRegion: this.addForm.CustRegion,
               remark: this.addForm.remark,
-              custDistCode: this.selectLocation.value[0].id,
             }
-            // console.log(params)
             const [err, res] = await to(customerApi.createCustomer(params))
             if (err) return
             if (res && res.code == 200) {
@@ -377,7 +363,6 @@
             }
           })
           .catch((err) => {
-            // console.log(err)
             this.$refs.uNotify.show({
               top: this.height + this.paddingTop + 10,
               type: 'warning',
@@ -411,12 +396,14 @@
       width: 100%;
       height: 284rpx;
       background: #3e7ef8;
+
       .title {
         position: relative;
         text-align: center;
         font-size: 32rpx;
         font-weight: bold;
         color: #ffffff;
+
         .back {
           position: absolute;
           top: 0;
@@ -438,19 +425,22 @@
       padding: 0 32rpx;
       overflow: auto;
       padding-bottom: 64rpx;
+
       .form-label {
         font-size: 32rpx;
         font-weight: bold;
         color: #323232;
         padding-bottom: 18rpx;
+
         .label-tag {
           width: 15rpx;
           height: 15rpx;
-          background:  #ff4d4f;
+          background: #ff4d4f;
           border-radius: 50%;
           margin-right: 10rpx;
         }
       }
+
       .save {
         width: 569rpx;
         height: 92rpx;

pages/customer/details.vue

@@ -2,7 +2,7 @@
  * @Author: liuzhenlin 461480418@qq.ocm
  * @Date: 2023-01-12 11:57:48
  * @LastEditors: liuzhenlin
- * @LastEditTime: 2023-02-15 18:21:43
+ * @LastEditTime: 2023-04-03 11:50:39
  * @Description: file content
  * @FilePath: \oms\pages\customer\details.vue
 -->
@@ -40,7 +40,7 @@
                 <u-col span="5">
                   <view class="flex_l">
                     <view class="info-label">客户行业：</view>
-                    <text class="info-txt">{{ customerData.custIndustry }}</text>
+                    <text class="info-txt">{{ selectDictLabel(industryColumns, customerData.custIndustry) }}</text>
                   </view>
                 </u-col>
               </u-row>
@@ -55,8 +55,8 @@
                 </u-col>
                 <u-col span="5">
                   <view class="flex_l">
-                    <view class="info-label">客户状态：</view>
-                    <text class="info-txt">{{ custStatus[customerData.custStatus] }}</text>
+                    <view class="info-label">所属销售：</view>
+                    <text class="info-txt">{{ customerData.salesName }}</text>
                   </view>
                 </u-col>
               </u-row>
@@ -119,7 +119,13 @@
   import Contacts from 'pages/customer/components/contacts'
   export default {
     name: 'omsIndex',
-    components: { customerDetail, followRecords, MoveInOpenSea, CollectionCustomer, Contacts },
+    components: {
+      customerDetail,
+      followRecords,
+      MoveInOpenSea,
+      CollectionCustomer,
+      Contacts,
+    },
     data() {
       return {
         openBtnWidth: false,
@@ -143,12 +149,9 @@
         paddingTop: '',
         customerData: {},
         abstractDetail: null,
-        custStatus: {
-          10: '正常',
-          20: '异常',
-        },
         customerId: 0, //客户id
         isPublic: false,
+        industryColumns: [], //行业
       }
     },
     onLoad(option) {
@@ -163,20 +166,37 @@
     onShow() {
       this.curTabIndex = 0
       this.openBtnWidth = false
+      this.getOptions()
       this.getCustomerDetail()
       this.getAbstractDetail()
     },
     methods: {
+      getOptions() {
+        Promise.all([
+          this.getDicts('cust_idy'), //行业
+        ])
+          .then(([industry]) => {
+            this.industryColumns = industry.data.values || []
+          })
+          .catch((err) => console.log(err))
+      },
       async getCustomerDetail() {
-        const [err, res] = await to(customerApi.getDetail({ ids: [this.customerId] }))
+        const [err, res] = await to(
+          customerApi.getDetail({
+            ids: [this.customerId],
+          })
+        )
         if (err) return
         if (res && res.code == 200) {
-          // console.log(res)
           this.customerData = res.data.list[0]
         }
       },
       async getAbstractDetail() {
-        const [err, res] = await to(customerApi.getAbstract({ id: this.customerId }))
+        const [err, res] = await to(
+          customerApi.getAbstract({
+            id: this.customerId,
+          })
+        )
         if (err) return
         if (res && res.code == 200) {
           this.abstractDetail = res.data.list
@@ -185,7 +205,6 @@
       },
       // 改变tab
       changeTabs(data) {
-        // console.log(data)
         this.curTabIndex = data.index
       },
       // 打开转移
@@ -242,12 +261,14 @@
       height: 356rpx;
       background: #3e7ef8;
       border-radius: 0 0 31rpx 31rpx;
+
       .title {
         position: relative;
         text-align: center;
         font-size: 32rpx;
         font-weight: bold;
         color: #ffffff;
+
         .back {
           position: absolute;
           top: 0;
@@ -265,15 +286,18 @@
       height: calc(100vh - 200rpx);
       overflow: hidden;
       padding-bottom: 64rpx;
+
       .main-top {
         padding: 0 32rpx;
       }
+
       .customer-box {
         width: 100%;
         background: #ffffff;
         box-shadow: 0 6rpx 19rpx 2rpx rgba(0, 45, 132, 0.15);
         border-radius: 32rpx;
         padding: 22rpx 38rpx 68rpx 40rpx;
+
         .header {
           .name {
             .img {
@@ -282,26 +306,31 @@
               border-radius: 50%;
               margin-right: 8rpx;
             }
+
             text {
               font-size: 28rpx;
               font-weight: bold;
               color: #323232;
             }
           }
+
           .date {
             font-size: 24rpx;
             color: #3e7ef8;
           }
         }
+
         .info {
           .info-item {
             margin-top: 18rpx;
+
             .info-label {
               width: 116rpx;
               text-align: left;
               font-size: 24rpx;
               color: #646464;
             }
+
             .info-txt {
               flex: 1;
               font-size: 24rpx;
@@ -310,6 +339,7 @@
           }
         }
       }
+
       .data-list {
         margin-top: 16rpx;
         width: 100%;
@@ -318,20 +348,24 @@
         padding: 32rpx;
         overflow: auto;
         padding-bottom: 145rpx;
+
         .status1 {
           color: #4096fb;
           background: rgba(64, 150, 251, 0.2);
         }
+
         .status2 {
           background: rgba(255, 184, 60, 0.2);
           color: #ffb83c;
         }
+
         .status3 {
           color: #fe6936;
           background: rgba(254, 105, 54, 0.2);
         }
       }
     }
+
     .fixed-btn-group {
       position: fixed;
       display: flex;
@@ -345,6 +379,7 @@
       border-radius: 20px;
       transition: all 0.2s;
       background: #fff;
+
       .btn {
         width: 60rpx;
         height: 60rpx;

pages/customer/index.vue

@@ -168,26 +168,22 @@
       getOptions() {
         Promise.all([this.getDicts('cust_idy')])
           .then(([industry]) => {
-            // this.levelOptions = level.data.values || []
             this.industryOptions = industry.data.values || []
           })
           .catch((err) => console.log(err))
       },
       // 筛选下的单选
       radioClick(item, target) {
-        // console.log(item.key, target)
         this[target] = item.key
       },
       // 选择日期
       async pickDate(e) {
-        // console.log(e)
         this.followUpDate = e.fulldate
       },
       // 重置
       reset() {
         this.followUpDate = ''
         this.industryChecked = null
-        // this.levelChecked = 0
       },
       // 确认
       confirmFilter() {

pages/distributor/create.vue

@@ -158,7 +158,6 @@
       }
     },
     onLoad(option) {
-      console.log(option)
       this.addForm.custId = Number(option.id)
       this.addForm.custName = option.name
     },
@@ -183,7 +182,6 @@
       },
       // 关闭选择销售
       closeUser(user) {
-        console.log(user)
         if (user) {
           this.addForm.belongSaleId = user.id
           this.addForm.belongSale = user.label
@@ -191,7 +189,6 @@
       },
       // 省份选择
       pickProvince(e) {
-        console.log(e)
         this.addForm.provinceId = e.value[0].id
         this.addForm.provinceDesc = e.value[0].distName
         this.showProvince = false
@@ -201,7 +198,6 @@
           .validate()
           .then(async () => {
             let params = this.addForm
-            console.log(params)
             const [err, res] = await to(distrApi.doAdd(params))
             if (err) return
             if (res && res.code == 200) {
@@ -218,7 +214,6 @@
             }
           })
           .catch((err) => {
-            console.log(err)
             this.$refs.uNotify.show({
               top: this.height + this.paddingTop + 10,
               type: 'warning',

pages/home/checkIn.vue

@@ -31,34 +31,18 @@
               <view class="label-tag"></view>
               打卡类型
             </view>
-            <u-input
-              :readonly="true"
-              placeholder="请选择销售模式"
-              v-model="form.punchVal"
-              border="none"
-              suffixIcon="arrow-down"
-              suffixIconStyle="color:#CDCDCD"
-              clearable
-              customStyle="padding: 0 30rpx 0 12rpx"></u-input>
+            <u-input :readonly="true" placeholder="请选择销售模式" v-model="form.punchVal" border="none"
+              suffixIcon="arrow-down" suffixIconStyle="color:#CDCDCD" clearable customStyle="padding: 0 30rpx 0 12rpx">
+            </u-input>
           </u-form-item>
-          <u-form-item
-            prop="targetName"
-            borderBottom
-            customStyle="padding:40rpx 0 30rpx"
-            v-if="form.punchType > 10"
+          <u-form-item prop="targetName" borderBottom customStyle="padding:40rpx 0 30rpx" v-if="form.punchType > 10"
             @click="openSelectUser()">
             <view class="form-label flex_l">
               <view class="label-tag"></view>
               {{ form.punchType == 20 ? '客户' : '经销商' }}
             </view>
-            <u-input
-              :readonly="true"
-              :placeholder="`请选择${form.punchType == 20 ? '客户' : '经销商'}`"
-              v-model="form.targetName"
-              border="none"
-              suffixIcon="arrow-down"
-              suffixIconStyle="color:#CDCDCD"
-              clearable
+            <u-input :readonly="true" :placeholder="`请选择${form.punchType == 20 ? '客户' : '经销商'}`"
+              v-model="form.targetName" border="none" suffixIcon="arrow-down" suffixIconStyle="color:#CDCDCD" clearable
               customStyle="padding: 0 30rpx 0 12rpx"></u-input>
           </u-form-item>
         </u-form>
@@ -71,7 +55,7 @@
             <u-loading-icon mode="circle" size="24rpx" :show="show"></u-loading-icon>
           </view>
         </template>
-        <u-list @scrolltolower="scrolltolower" lowerThreshold="200" v-else>
+        <u-list height="calc(100vh - 410rpx)" @scrolltolower="scrolltolower" v-else>
           <u-list-item v-for="(item, index) in checkList" :key="index">
             <u-cell :title="item.punchTime" :label="item.punchLocation"></u-cell>
           </u-list-item>
@@ -86,11 +70,7 @@
       </view>
     </uni-file-picker> -->
     <!-- 打卡类型 -->
-    <u-picker
-      :show="showCheckType"
-      :columns="[checkTypeColumns]"
-      keyName="value"
-      @cancel="showCheckType = false"
+    <u-picker :show="showCheckType" :columns="[checkTypeColumns]" keyName="value" @cancel="showCheckType = false"
       @confirm="pickCheckType"></u-picker>
     <!-- 选择经销商 -->
     <select-dealer ref="dealer" @close="closeDealer($event)"></select-dealer>
@@ -101,13 +81,18 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
+  import {
+    mapGetters
+  } from 'vuex'
   import to from 'await-to-js'
   import api from '@/api/system'
   import SelectDealer from 'components/SelectDealer'
   import SelectCustomer from 'components/SelectCustomer'
   export default {
-    components: { SelectDealer, SelectCustomer },
+    components: {
+      SelectDealer,
+      SelectCustomer
+    },
     data() {
       return {
         height: '',
@@ -132,21 +117,32 @@
           pageNum: 1,
           pageSize: 10,
         },
-        checkTypeColumns: [
-          { key: '10', value: '居家' },
-          { key: '20', value: '客户' },
-          { key: '30', value: '经销商' },
+        total: 0,
+        checkTypeColumns: [{
+            key: '10',
+            value: '居家'
+          },
+          {
+            key: '20',
+            value: '客户'
+          },
+          {
+            key: '30',
+            value: '经销商'
+          },
           // { key: 40, value: '代理商' },
         ],
         rules: {
-          punchVal: [{ required: true, trigger: ['blur', 'change'], message: '请选择打卡类型' }],
-          targetName: [
-            {
-              required: true,
-              trigger: ['blur', 'change'],
-              message: `请选择用户`,
-            },
-          ],
+          punchVal: [{
+            required: true,
+            trigger: ['blur', 'change'],
+            message: '请选择打卡类型'
+          }],
+          targetName: [{
+            required: true,
+            trigger: ['blur', 'change'],
+            message: `请选择用户`,
+          }, ],
         },
       }
     },
@@ -198,15 +194,14 @@
         const _this = this
         uni.getLocation({
           type: 'wgs84',
-          success: function (res) {
+          success: function(res) {
             const latitude = res.latitude.toString()
             const longitude = res.longitude.toString()
             uni.request({
               header: {
                 'Content-Type': 'application/text',
               },
-              url:
-                process.uniEnv.VUE_APP_PROTOCOL +
+              url: process.uniEnv.VUE_APP_PROTOCOL +
                 'apis.map.qq.com/ws/geocoder/v1/?location=' +
                 latitude +
                 ',' +
@@ -235,7 +230,6 @@
       },
       async checkIn() {
         const [fail, resp] = await to(this.$refs.form.validate())
-        console.log(fail)
         if (fail && fail.length > 0) {
           this.$refs.uNotify.show({
             top: this.height + this.paddingTop + 10,
@@ -301,7 +295,11 @@
         })
       },
       showCheckList() {
-        if (!this.showList) this.loadCheckList()
+        if (!this.showList) {
+          this.queryForm.pageNum = 1
+          this.checkList = []
+          this.loadCheckList()
+        }
         this.showList = !this.showList
       },
       async loadCheckList() {
@@ -312,8 +310,8 @@
           return
         }
         if (res && res.code == 200) {
-          // this.checkList = [...this.checkList, ...(res.data.list || [])]
-          this.checkList = res.data.list
+          this.checkList = [...this.checkList, ...(res.data.list || [])]
+          // this.checkList = res.data.list
           this.total = res.data.total
           this.loadStatus = this.checkList.length == this.total ? 'nomore' : 'loadmore'
         } else {
@@ -321,11 +319,10 @@
         }
       },
       scrolltolower() {
-        if (this.list.length < this.total && this.loadStatus != 'loading') {
+        if (this.checkList.length < this.total && this.loadStatus != 'loading') {
           this.queryForm.pageNum++
           this.$u.throttle(this.loadCheckList(), 2000, false)
         }
-        this.loadCheckList()
       },
       goBack() {
         uni.navigateBack({

pages/openSeaCustomer/components/collectionCustomer.vue

@@ -1,33 +1,33 @@
 <template>
   <view>
-    <!-- 转移公海 -->
-    <u-modal
-      :show="showCollectionModel"
-      :showCancelButton="true"
-      @confirm="confirmCollection()"
-      @cancel="closeMoveInModel()"
-      :asyncClose="true"
-      title="领取客户">
+    <!-- 领取客户 -->
+    <u-modal :show="showCollectionModel" :showCancelButton="true" @confirm="confirmCollection()"
+      @cancel="closeMoveInModel()" title="领取客户">
       <view class="slot-content" style="width: 100%">
         <view class="flex">
           <text>申请说明：</text>
-          <u-textarea
-            v-model="openSeaObj.applyRemark"
-            placeholder="请输入申请说明"
-            height="180"
-            :count="true"
-            maxlength="500"></u-textarea>
+          <u-textarea v-model="openSeaObj.applyRemark" placeholder="请输入申请说明" height="180" :count="true" maxlength="500">
+          </u-textarea>
         </view>
       </view>
     </u-modal>
+    <u-notify ref="uNotify"></u-notify>
   </view>
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
+  import {
+    mapGetters
+  } from 'vuex'
   import customerApi from '../../../api/customer'
   import to from 'await-to-js'
   export default {
+    props: {
+      position: {
+        default: () => {},
+        required: true,
+      }
+    },
     data() {
       return {
         showCollectionModel: false,
@@ -48,9 +48,22 @@
       },
       // 领用
       async confirmCollection() {
-        this.openSeaObj.salesId = this.userId
-        this.openSeaObj.salesName = this.username
-        let params = this.openSeaObj
+        // this.openSeaObj.salesId = this.userId
+        // this.openSeaObj.salesName = this.username
+        if (!this.openSeaObj.applyRemark) {
+          this.$refs.uNotify.show({
+            top: this.position.height + this.position.paddingTop + 10,
+            type: 'warning',
+            message: '请输入领用原因',
+            duration: 1000 * 3,
+          })
+          return
+        }
+        let params = {
+          ...this.openSeaObj,
+          salesId: this.userId,
+          salesName: this.username
+        }
         const [err, res] = await to(customerApi.collection(params))
         if (err) return this.closeMoveInModel()
         // console.log(res.code)

pages/openSeaCustomer/index.vue

@@ -22,17 +22,9 @@
       <view class="query-wrap">
         <view class="search-container">
           <view class="search-input">
-            <u-input
-              clearable
-              placeholderStyle="font-size:26rpx"
-              :customStyle="{ height: '66rpx' }"
-              v-model="custName"
-              prefixIcon="search"
-              prefixIconStyle="font-size: 22px;color: #909399"
-              placeholder="请输入客户名称"
-              shape="circle"
-              border="surround"
-              @change="change"></u-input>
+            <u-input clearable placeholderStyle="font-size:26rpx" :customStyle="{ height: '66rpx' }" v-model="custName"
+              prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" placeholder="请输入客户名称" shape="circle"
+              border="surround" @change="change"></u-input>
           </view>
           <view class="search-btn" @click="openFilter">筛选</view>
           <view class="search-btn" @click="searchList">搜索</view>
@@ -44,11 +36,7 @@
               <view class="tit">客户行业</view>
               <view class="menu-list">
                 <view class="menu-item" v-for="(item, index) in industryOptions" :key="index">
-                  <u-tag
-                    shape="circle"
-                    :text="item.value"
-                    :plain="industryChecked != item.key"
-                    :name="item.key"
+                  <u-tag shape="circle" :text="item.value" :plain="industryChecked != item.key" :name="item.key"
                     @click="radioClick(item, 'industryChecked')"></u-tag>
                 </view>
               </view>
@@ -99,10 +87,8 @@
                 </view>
                 <view class="info-row flex_l">
                   <text class="info-label">客户类别：</text>
-                  <u-text
-                    color="#323232"
-                    size="24rpx"
-                    :text="selectDictLabel(industryOptions, v.custIndustry)"></u-text>
+                  <u-text color="#323232" size="24rpx" :text="selectDictLabel(industryOptions, v.custIndustry)">
+                  </u-text>
                 </view>
                 <view class="info-row flex_l">
                   <text class="info-label">最后跟进时间：</text>
@@ -133,7 +119,8 @@
     <!-- 消息提示 -->
     <u-toast ref="uToast"></u-toast>
     <!-- 领用 -->
-    <collection-customer ref="collection" @fetchList="searchList()"></collection-customer>
+    <collection-customer :position="{height,paddingTop}" ref="collection" @fetchList="searchList()">
+    </collection-customer>
   </view>
 </template>
 <script>
@@ -142,7 +129,9 @@
   import CollectionCustomer from '../openSeaCustomer/components/collectionCustomer'
   export default {
     name: 'omsIndex',
-    components: { CollectionCustomer },
+    components: {
+      CollectionCustomer
+    },
     data() {
       return {
         custStatus: {
@@ -205,7 +194,7 @@
         this.searchList()
       },
       // 上拉滚动
-      lower: function (e) {
+      lower: function(e) {
         // console.log(this.customerData.length)
         // console.log(this.customerDataTotal)
         // console.log(this.loadStatus)
@@ -298,12 +287,14 @@
       width: 100%;
       height: 284rpx;
       background: #3e7ef8;
+
       .title {
         position: relative;
         text-align: center;
         font-size: 32rpx;
         font-weight: bold;
         color: #ffffff;
+
         .back {
           position: absolute;
           top: 0;
@@ -325,14 +316,18 @@
       padding: 0 32rpx;
       overflow: auto;
       padding-bottom: 64rpx;
+
       .query-wrap {
         padding-top: 20rpx;
+
         .search-container {
           display: flex;
           align-items: center;
+
           .search-input {
             flex: 1;
           }
+
           .search-btn {
             text-align: center;
             line-height: 60rpx;
@@ -346,15 +341,18 @@
           }
         }
       }
+
       .data-list {
         width: 100%;
         height: calc(100vh - 372rpx);
         overflow: auto;
+
         .data-item {
           background: rgba(242, 243, 245, 0.5);
           border-radius: 15rpx;
           padding: 28rpx 40rpx 28rpx 38rpx;
           margin-top: 32rpx;
+
           .customer-name {
             .name {
               flex: 1;
@@ -363,6 +361,7 @@
               font-size: 28rpx;
               margin-right: 12rpx;
             }
+
             .user-code {
               width: 180rpx;
               height: 32rpx;
@@ -371,22 +370,27 @@
               line-height: 32rpx;
             }
           }
+
           .customer-info {
             .info-left {
               .transfer-btn {
                 margin-top: 20rpx;
                 width: 150rpx;
               }
+
               .info-row {
                 margin-top: 12rpx;
+
                 .info-label {
                   color: #646464;
                   font-size: 24rpx;
                 }
               }
             }
+
             .info-right {
               padding-top: 30rpx;
+
               .user-img {
                 border-radius: 50%;
                 width: 46rpx;
@@ -405,21 +409,26 @@
       height: 100%;
       left: 0;
       z-index: 1;
+
       .filter-wrap {
         width: 100%;
         padding: 20rpx;
         background: #ffffff;
+
         .filter-item {
           padding-bottom: 30rpx;
+
           .tit {
             font-size: 26rpx;
             color: #323232;
             font-weight: bold;
             padding-bottom: 20rpx;
           }
+
           .menu-list {
             display: flex;
             flex-wrap: wrap;
+
             .menu-item {
               margin-right: 40rpx;
               margin-bottom: 20rpx;
@@ -427,13 +436,15 @@
           }
         }
       }
+
       .btn-box {
         width: 698rpx;
         height: 75px;
         display: flex;
         align-items: center;
         justify-content: space-between;
-        > view {
+
+        >view {
           width: 320rpx;
           height: 40px;
           border-radius: 40px;
@@ -443,9 +454,11 @@
           text-align: center;
           line-height: 40px;
         }
+
         .reset {
           color: #ec652b;
         }
+
         .submit {
           color: #fff;
           background-color: #ec652b;

pages/project/components/contacts.vue

@@ -79,7 +79,6 @@
 
     mounted() {
       this.getContacts()
-      console.log('customerId', this.customerId)
     },
 
     methods: {

pages/project/components/followRecords.vue

@@ -54,7 +54,6 @@
 
     mounted() {
       this.getRecords()
-      console.log('projectId', this.projectId)
     },
 
     methods: {

pages/project/components/transferReserve.vue

@@ -46,7 +46,6 @@
         let params = this.addFrom
         const [err, res] = await to(projectApi.toReserve(params))
         if (err) return this.close()
-        console.log(res.code)
         if (res.code == 200) {
           this.$refs.uToast.show({
             type: 'loading',

pages/project/create.vue

@@ -2,7 +2,7 @@
  * @Author: liuzhenlin 461480418@qq.ocm
  * @Date: 2023-01-12 11:57:48
  * @LastEditors: liuzhenlin
- * @LastEditTime: 2023-02-22 13:56:08
+ * @LastEditTime: 2023-03-27 16:19:53
  * @Description: file content
  * @FilePath: \oms\pages\project\create.vue
 -->
@@ -257,7 +257,7 @@
           </u-form-item>
           <u-form-item borderBottom customStyle="padding:40rpx 0 30rpx">
             <view class="form-label flex_l">
-              <view class="label-tag"></view>
+              <!-- <view class="label-tag"></view> -->
               备注
             </view>
             <u-input
@@ -270,10 +270,13 @@
         </u-form>
       </view>
       <view class="step2" v-else-if="step == 2">
-        <view class="step-tit">添加产品</view>
-        <view class="add-btn" @click="$refs.product.open()">+</view>
+        <view class="step-tit center">
+          <text class="margin20">添加产品</text>
+          <view class="add-btn" @click="$refs.product.open()">+</view>
+        </view>
         <view class="product-wrap">
           <view class="product-item" v-for="(v, i) in productList" :key="v.id">
+            <u-text type="primary" text="删除" customStyle="margin-left:20rpx" @click="removeProductItem(i)"></u-text>
             <view class="product-label flex_l">
               产品编码:
               <view class="product-val">{{ v.prodCode }}</view>
@@ -289,7 +292,7 @@
             <view class="product-label flex_l">
               产品单价:
               <view class="product-val">
-                <u-input v-model="productList[i].guidPrice" clearable></u-input>
+                <u-input v-model.number="productList[i].guidPrice" clearable></u-input>
               </view>
             </view>
             <view class="product-label flex_l">
@@ -399,7 +402,7 @@
     <!-- 选择用户 -->
     <select-user ref="allUser" @close="closeAllUser($event)"></select-user>
     <!-- 选择产品 -->
-    <select-product ref="product" @close="closeProduct($event)"></select-product>
+    <select-product ref="product" :selectedRows="productList" @close="closeProduct($event)"></select-product>
     <!-- 项目来源 -->
     <u-picker
       :show="showNboSource"
@@ -476,7 +479,7 @@
           saleId: '', //销售工程师id
           salesModel: '', //销售模式（10直销20经销30代理）
           salesVal: '', //销售模式文字
-          distributorId: '', //经销商/代理商ID
+          distributorId: null, //经销商/代理商ID
           distributorName: '', //经销商/代理商名称
           productLine: '', //产品线来源
           productLineVal: '', //产品线文字
@@ -513,7 +516,7 @@
       }
     },
     computed: {
-      ...mapGetters(['userId', 'username']),
+      ...mapGetters(['userId', 'nickName']),
     },
     onLoad(option) {
       this.addForm.custId = parseInt(option.id)
@@ -602,8 +605,10 @@
         }
       },
       closeProduct(product) {
-        let data = [...this.productList, ...product]
-        this.productList = data
+        this.productList = [...product]
+      },
+      removeProductItem(idx) {
+        this.productList.splice(idx, 1)
       },
       // 选择来源
       pickSource(e) {
@@ -622,7 +627,7 @@
         this.addForm.salesModel = e.value[0].key
         this.addForm.salesVal = e.value[0].value
         if (e.value[0].key == '10') {
-          this.distributorId = ''
+          this.distributorId = null
           this.distributorName = ''
         }
         this.showModel = false
@@ -693,7 +698,7 @@
           .then(async () => {
             let params = this.addForm
             params.nboBudget = Number(params.nboBudget)
-            params.saleName = this.username
+            params.saleName = this.nickName
             params.saleId = this.userId
             let products = this.productList.map((item) => ({
               ProdId: item.id,
@@ -717,7 +722,6 @@
             }
           })
           .catch((err) => {
-            console.log(err)
             this.$refs.uNotify.show({
               top: this.height + this.paddingTop + 10,
               type: 'warning',
@@ -822,6 +826,7 @@
         margin-top: 30rpx;
         height: calc(100% - 150rpx);
         overflow: auto;
+        padding: 0 10rpx;
         .product-item {
           margin: 30rpx 0;
           padding: 20rpx;
@@ -832,6 +837,10 @@
           }
         }
       }
+      .margin20 {
+        font-weight: bold;
+        margin: 10px 20px;
+      }
       .add-btn {
         color: #fff;
         width: 120rpx;

pages/project/details.vue

@@ -243,7 +243,6 @@
         const [err, res] = await to(projectApi.getBusinessProduct({ id: this.projectId }))
         if (err) return
         if (res && res.code == 200) {
-          console.log(res)
           this.productList = res.data
         }
       },

pages/project/downgrade.vue

@@ -157,7 +157,6 @@
       this.paddingTop = navData.top + 'px'
     },
     onLoad(option) {
-      console.log(option.id) //打印出上个页面传递的参数。
       this.addForm.id = parseInt(option.id)
     },
     onShow() {
@@ -183,7 +182,6 @@
         const timeFormat = uni.$u.timeFormat
         let timeValue = await timeFormat(e.value, 'yyyy-mm-dd hh:MM')
         this.addForm.technicalSupportTime = timeValue
-        console.log(timeValue)
       },
       handleDowngrade() {
         this.$refs.addForm
@@ -192,7 +190,6 @@
             this.showModal = true
           })
           .catch((err) => {
-            console.log(err)
             this.$refs.uNotify.show({
               top: this.height + this.paddingTop + 10,
               type: 'warning',
@@ -218,7 +215,6 @@
       },
       closeUser(user) {
         if (user) {
-          console.log(user)
           this.addForm.userId = user.id
           this.addForm.userName = user.label
         }

pages/project/index.vue

@@ -199,7 +199,6 @@
       },
       // 改变tab
       changeTabs(data) {
-        console.log(data)
         this.curTabIndex = data.status
         this.searchList()
       },
@@ -235,10 +234,6 @@
             this.projectData = [...this.projectData, ...(res.data.list || [])]
           }
           this.projectDataTotal = res.data.total
-          console.log(
-            'this.projectData.length == this.projectDataTotal',
-            this.projectData.length == this.projectDataTotal
-          )
           this.loadStatus = this.projectData.length == this.projectDataTotal ? 'nomore' : 'loadmore'
         } else {
           this.loadStatus = 'nomore'

pages/project/transfer.vue

@@ -93,7 +93,6 @@
       this.paddingTop = navData.top + 'px'
     },
     onLoad(option) {
-      console.log(option.id) //打印出上个页面传递的参数。
       this.transferObj.id = parseInt(option.id)
     },
     onShow() {},
@@ -102,9 +101,7 @@
         this.$refs.addForm
           .validate()
           .then(async () => {
-            console.log(1111)
             let params = this.transferObj
-            console.log(params)
             const [err, res] = await to(projectApi.transfer(params))
             if (err) return
             if (res && res.code == 200) {
@@ -118,7 +115,6 @@
             }
           })
           .catch((err) => {
-            console.log(err)
             this.$refs.uNotify.show({
               top: this.height + this.paddingTop + 10,
               type: 'warning',
@@ -129,7 +125,6 @@
       },
       closeUser(user) {
         if (user) {
-          console.log(user)
           this.transferObj.userId = user.id
           this.transferObj.userName = user.label
         }

pages/project/upgrade.vue

@@ -498,7 +498,6 @@
       // 经销商
       closeDealer(dealer) {
         if (dealer) {
-          console.log(dealer)
           this.addForm.distributorId = dealer.id
           this.addForm.distributorName = dealer.name
         }
@@ -518,7 +517,6 @@
       // 关闭选择客户联系人
       closeContact(user) {
         if (user) {
-          console.log(user)
           this.addForm.makerId = user.id
           this.addForm.makerName = user.cuctName
           this.addForm.makerDept = user.dept
@@ -532,7 +530,6 @@
         const timeFormat = uni.$u.timeFormat
         let timeValue = await timeFormat(e.value, 'yyyy-mm-dd hh:MM')
         this.addForm.technicalSupportTime = timeValue
-        console.log(timeValue)
       },
       // 项目预算时间
       async pickBudgetDate(e) {
@@ -540,7 +537,6 @@
         const timeFormat = uni.$u.timeFormat
         let timeValue = await timeFormat(e.value, 'yyyy-mm-dd hh:MM')
         this.addForm.nboBudgetTime = timeValue
-        console.log(timeValue)
       },
       // 采购时间
       async pickPurchasingDate(e) {
@@ -548,11 +544,9 @@
         const timeFormat = uni.$u.timeFormat
         let timeValue = await timeFormat(e.value, 'yyyy-mm-dd hh:MM')
         this.addForm.purchasingTime = timeValue
-        console.log(timeValue)
       },
       // 选择是否采用大数参数
       chooseRadio(e) {
-        console.log(e)
         if (e == '20') {
           this.addForm.file = ''
         }
@@ -579,7 +573,6 @@
             SrvEnv: 'dev',
           },
           success: (res) => {
-            console.log('success', res)
             this.$refs.uToast.show({
               type: 'success',
               message: '提交成功',
@@ -593,7 +586,6 @@
               type: 'success',
               message: '提交失败',
             })
-            console.log('error', err)
           },
           complete: () => {
             this.showModal = false
@@ -607,7 +599,6 @@
             this.showModal = true
           })
           .catch((err) => {
-            console.log(err)
             this.$refs.uNotify.show({
               top: this.height + this.paddingTop + 10,
               type: 'warning',

pages/publicPages/concatCreate.vue

@@ -137,7 +137,6 @@
       }
     },
     onLoad(option) {
-      console.log(option)
       this.addForm.custId = Number(option.id)
       this.addForm.custName = option.name
     },
@@ -153,7 +152,6 @@
           .validate()
           .then(async () => {
             let params = this.addForm
-            console.log(params)
             const [err, res] = await to(customerApi.createContact(params))
             if (err) return
             if (res && res.code == 200) {
@@ -170,7 +168,6 @@
             }
           })
           .catch((err) => {
-            console.log(err)
             this.$refs.uNotify.show({
               top: this.height + this.paddingTop + 10,
               type: 'warning',

pages/publicPages/follow.vue

@@ -193,7 +193,6 @@
       // ...mapGetters(['details']),
     },
     onLoad(option) {
-      console.log(option)
       this.targetType = option.targetType
       this.curId = parseInt(option.id)
     },
@@ -203,7 +202,6 @@
       this.paddingTop = navData.top + 'px'
     },
     mounted() {
-      console.log(this.details)
       this.initData()
     },
     methods: {
@@ -235,7 +233,6 @@
       },
       // 打开客户联系人
       open() {
-        console.log(this.details)
         if (this.targetType == '10') {
           this.$refs.concat.open(this.details.id)
         } else if (this.targetType == '20') {
@@ -244,7 +241,6 @@
       },
       // 行业选择
       pickMode(e) {
-        console.log(e)
         this.addForm.modeId = e.value[0].id
         this.addForm.mode = e.value[0].label
         this.showMode = false
@@ -254,18 +250,15 @@
         const timeFormat = uni.$u.timeFormat
         let timeValue = await timeFormat(e.value, 'yyyy-mm-dd hh:MM')
         this.addForm.date = timeValue
-        console.log(timeValue)
       },
       // 关闭选择用户
       closeConcat(user) {
         if (user) {
-          console.log(user)
           this.addForm.contactsName = user.label
           this.addForm.contactsId = user.id
         }
       },
       handleAdd() {
-        console.log(this.details)
         this.$refs.addForm
           .validate()
           .then(async () => {
@@ -313,7 +306,6 @@
             }
           })
           .catch((err) => {
-            console.log(err)
             this.$refs.uNotify.show({
               top: this.height + this.paddingTop + 10,
               type: 'warning',
@@ -324,7 +316,6 @@
       },
       // // 选择上传触发函数
       select(e) {
-        console.log(e)
         let url = process.uniEnv.VUE_APP_UPLOAD_WEED
         uni.request({
           url, //仅为示例，并非真实接口地址。

pages/schedule/components/add.vue

@@ -181,7 +181,6 @@
         let day = new Date()
         day.setTime(day.getTime() + 24 * 60 * 60 * 1000)
         let date = day.getFullYear() + '-' + (day.getMonth() + 1) + '-' + day.getDate()
-        console.log(date)
         return date
       },
     },

pages/schedule/log.vue

@@ -105,7 +105,6 @@
         }
       },
       showDesc(v) {
-        console.log(v.followDesc)
         if (v.followDesc) {
           this.showModal = true
           this.content = v.followDesc
@@ -136,14 +135,12 @@
           }
           this.followTotal = res.data.total
           this.loadStatus = this.followList.length == this.followTotal ? 'nomore' : 'loadmore'
-          console.log(this.loadStatus)
         } else {
           this.loadStatus = 'nomore'
         }
       },
       // 改变tab
       changeTabs(data) {
-        console.log(data)
         this.curTabIndex = data.status
         this.searchList(true)
       },

pages/schedule/manage.vue

@@ -129,7 +129,6 @@
       // 打开新增
       openAdd() {
         this.addVisible = true
-        console.log(this.addVisible)
       },
       // 获取周
       getWeek() {
@@ -145,17 +144,14 @@
             String(date.getDate()).padStart(2, '0')
           )
         })
-        console.log(daysOfThisWeek)
         // 当前周的全部日期
         this.calendarList = daysOfThisWeek
-        console.log('calendarList', this.calendarList)
         //   当前日期
         this.currentDay = daysOfThisWeek[dayOfToday]
       },
       async getTodoData(date = null) {
         const params = { schDate: date || this.currentDay, dataType: '10', pageNum: 1, pageSize: 999 }
         const [err, res] = await to(scheduleApi.getList(params))
-        console.log(res)
         if (err) return
         if (res && res.code == 200) {
           this.todoData = res.data.list

pages/schedule/supervise/components/progress.vue

@@ -158,7 +158,6 @@
     },
     mounted() {
       this.getProgressList()
-      console.log(this.details)
     },
     methods: {
       // 获取进展信息
@@ -193,7 +192,6 @@
       },
       // // 选择上传触发函数
       select(e, index) {
-        console.log(e, index)
         let url = process.uniEnv.VUE_APP_UPLOAD_WEED
         uni.request({
           url, //仅为示例，并非真实接口地址。

pages/schedule/supervise/details.vue

@@ -259,10 +259,8 @@
         let nameArr = []
         if (ids) {
           let idList = ids.split(',')
-          console.log(idList)
           idList.forEach((item) => {
             let findUser = this.userList.find((user) => user.key == item)
-            console.log(findUser)
             if (findUser && findUser.value) nameArr.push(findUser.value)
           })
         }
@@ -279,7 +277,6 @@
         }
         if (res && res.code == 200) {
           this.details = res.data.list[0] || {}
-          console.log(this.details)
         }
       },
       // 接收待办

pages/schedule/supervise/index.vue

@@ -226,14 +226,12 @@
           }
           this.taskTotal = res.data.total
           this.loadStatus = this.taskList.length == this.taskTotal ? 'nomore' : 'loadmore'
-          console.log(this.loadStatus)
         } else {
           this.loadStatus = 'nomore'
         }
       },
       // 改变tab
       changeTabs(data) {
-        console.log(data)
         this.curTabIndex = data.status
         this.searchList(true)
       },

store/index.js

@@ -102,7 +102,6 @@ const store = new Vuex.Store({
      * @param {*} userInfo
      */
     async login({ commit, dispatch }, userInfo) {
-      console.log(userInfo.rememberPassword)
       const [err, res] = await to(userApi.login(userInfo))
       if (err) return
       if (res.code == 200) {