更新

src/api/modules/item.js

@@ -24,4 +24,7 @@ export default {
   mine(params) {
     return request.get(`item/mine`, { params: params })
   },
+  me(params) {
+    return request.get(`item/me`, { params: params })
+  },
 }

src/views/item/detail.vue

@@ -203,7 +203,6 @@
                       <el-form-item
                         label="签订日期："
                         prop="signDate"
-                        :rules="{required: true, message: '请选择签订日期', trigger: 'blur'}"
                         label-width="120px"
                         class="postInfo-container-item"
                       >
@@ -243,7 +242,6 @@
                       <el-form-item
                         label="合同金额："
                         prop="amount"
-                        :rules="{required: true, message: '请输入合同金额', trigger: 'blur'}"
                         label-width="120px"
                         class="postInfo-container-item"
                       >

src/views/item/list.vue

@@ -237,8 +237,6 @@
         listQuery: {
           page: 1,
           size: 10,
-          // name: '',
-          // staffNo: '',
           descs: 'id',
           state:null
         },
@@ -266,10 +264,12 @@
           current: 1,
           size: 10,
           descs: 'id',
-          me: false
+          me: false,
         }
         if (this.$router.currentRoute.path === '/item/list/me'){
-          this.listQuery.me = true;
+          // const userIds = [];
+          // userIds.push(this.$store.getters.userInfo.id);
+          // this.listQuery.userIds = userIds;
         }
         this.getList()
       },
@@ -311,10 +311,10 @@
         this.getList()
       },
       getList() {
-        const that = this
-        this.listLoading = true
-        const key = {}
-        if (this.$router.currentRoute.path === '/item/list/me'){
+        const that = this;
+        this.listLoading = true;
+        const key = {};
+        if (this.$router.currentRoute.path === '/item/list/mine'){
           this.$api.item.mine(Object.assign({}, that.listQuery, key)).then((res) => {
             that.pageData = res.data;
             setTimeout(() => {
@@ -324,6 +324,16 @@
             .catch(() => {
               that.listLoading = false
             })
+        }else if(this.$router.currentRoute.path === '/item/list/me') {
+          this.$api.item.me(Object.assign({}, that.listQuery, key)).then((res) => {
+            that.pageData = res.data;
+            setTimeout(() => {
+              that.listLoading = false
+            }, 200)
+          })
+            .catch(() => {
+              that.listLoading = false
+            })
         }else{
           this.$api.item.list(Object.assign({}, that.listQuery, key)).then((res) => {
             that.pageData = res.data

src/views/market/visit/detail.vue

@@ -26,6 +26,7 @@
                           filterable
                           class="filter-item"
                           style=" width: 100%"
+                          @change="getCustomerDetail"
 
                         >
                           <el-option
@@ -38,6 +39,42 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
+                  <el-row>
+                    <el-col :xs="24" :sm="12" :lg="10" :span="6">
+                      <el-form-item
+                        label="客户部门："
+                        prop="department"
+                        label-width="180px"
+                        class="postInfo-container-item"
+                      >
+                        <el-input style="width: 100%" :value="postForm.customerDepartment" readonly disabled/>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :xs="24" :sm="12" :lg="10" :span="6">
+                      <el-form-item
+                        label="客户科室："
+                        prop="section"
+                        label-width="180px"
+                        class="postInfo-container-item"
+                      >
+                        <el-input style="width: 100%" :value="postForm.customerSection" readonly disabled/>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :xs="24" :sm="12" :lg="10" :span="6">
+                      <el-form-item
+                        label="客户职位："
+                        prop="position"
+                        label-width="180px"
+                        class="postInfo-container-item"
+                      >
+                        <el-input style="width: 100%" :value="postForm.customerPosition" readonly disabled/>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
                 </div>
               </div>
               <div>
@@ -66,18 +103,18 @@
                     <el-row>
                       <el-col :xs="24" :sm="12" :lg="10" :span="6">
                         <el-form-item
-                          label="拜访时间："
+                          label="拜访日期："
                           prop="visitTime"
-                          :rules="{required: true, message: '请选择时间', trigger: 'blur'}"
+                          :rules="{required: true, message: '请选择日期', trigger: 'blur'}"
                           label-width="180px"
                           class="postInfo-container-item"
                         >
                           <el-date-picker
                             v-model="postForm.visitTime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="date"
+                            value-format="yyyy-MM-dd"
                             style="width: 100%"
-                            placeholder="选择时间"
+                            placeholder="选择日期"
                           />
                         </el-form-item>
                       </el-col>
@@ -93,7 +130,6 @@
                           prop="spot"
                           label-width="180px"
                           class="postInfo-container-item"
-                          :rules="{required: true, message: '请填写拜访地点', trigger: 'blur'}"
                         >
                           <el-input v-model="postForm.spot" class="filter-item"/>
                         </el-form-item>
@@ -111,7 +147,7 @@
                           label-width="180px"
                           class="postInfo-container-item"
                         >
-                          <el-input type="textarea" v-model="postForm.content" class="filter-item" placeholder="200字符"/>
+                          <el-input type="textarea" v-model="postForm.content" class="filter-item" placeholder="200字符" :autosize="{ minRows: 8, maxRows: 8}"/>
                         </el-form-item>
                       </el-col>
                     </el-row>
@@ -138,7 +174,12 @@
     data() {
       return {
         type: 'detail',
-        postForm: {},
+        postForm: {
+          customerId:null,
+          customerDepartment:null,
+          customerSection:null,
+          customerPosition:null
+        },
         visitId : this.$route.query.id,
         activeName: 'first',
         vLoading: false,
@@ -151,6 +192,13 @@
       this.getDetail();
     },
     methods: {
+      getCustomerDetail(){
+        this.$api.customer.detail(this.postForm.customerId).then(res =>{
+          this.postForm.customerDepartment = res.data.department;
+          this.postForm.customerPosition = res.data.position;
+          this.postForm.customerSection = res.data.section;
+        })
+      },
       getDetail() {
         if (this.visitId) {
           this.$api.visit.detail(this.visitId).then(res => {

src/views/market/visit/list.vue

@@ -54,19 +54,19 @@
             <span>{{ row.customerName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="拜访类型" align="center" width="210">
+        <el-table-column label="客户部门" align="center" width="210">
           <template slot-scope="{row}">
-            <span>{{ row.visitType }}</span>
+            <span>{{ row.customerDepartment }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="拜访时间" align="center" width="210">
+        <el-table-column label="客户科室" align="center" width="210">
           <template slot-scope="{row}">
-            <span>{{ row.visitTime }}</span>
+            <span>{{ row.customerSection }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="拜访地点" align="center" width="210">
+        <el-table-column label="客户职位" align="center" width="210">
           <template slot-scope="{row}">
-            <span>{{ row.spot }}</span>
+            <span>{{ row.customerPosition }}</span>
           </template>
         </el-table-column>
         <el-table-column label="客户经理" align="center" width="210">
@@ -74,6 +74,21 @@
             <span>{{ row.userName }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="拜访类型" align="center" width="210">
+          <template slot-scope="{row}">
+            <span>{{ row.visitType }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="拜访日期" align="center" width="210">
+          <template slot-scope="{row}">
+            <span>{{ row.visitTime }}</span>
+          </template>
+        </el-table-column>
+<!--        <el-table-column label="拜访地点" align="center" width="210">-->
+<!--          <template slot-scope="{row}">-->
+<!--            <span>{{ row.spot }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="沟通内容" align="center">
           <template slot-scope="{row}">
             <span>{{ row.content }}</span>

src/views/set/department/index.vue

@@ -147,8 +147,8 @@
           <el-input v-model="temp.name" class="filter-item"/>
         </el-form-item>
 
-        <el-form-item label="上级部门：" filterable prop="">
-          <el-select v-model="temp.parentId" filterable class="filter-item" style="float: left;width: 100%;" placeholder="请选择">
+        <el-form-item label="上级部门：" filterable prop="parentId">
+          <el-select v-model="temp.parentId" filterable class="filter-item" style="float: left;width: 100%;" placeholder="请选择" clearable>
             <el-option
               v-for="item in partOptions"
               :disabled="disabledIds.includes(item.id)"
@@ -230,11 +230,6 @@
             message: '请填写名称',
             trigger: 'blur'
           }],
-          parentId: [{
-            required: true,
-            message: '请选择所属部门',
-            trigger: 'change'
-          }]
         },
         partOptions: [],
         statisticsInfo: {},