行动页面优化；

src/views/business/spd/bo/behavior/behaviorList.vue

@@ -91,7 +91,7 @@
                 v-model="form.time"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择行动日期">
+                placeholder="">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -158,7 +158,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="销售区域" prop="marketingAreaName">
               <dr-popover-select v-model="form.marketingAreaName" title="销售区域" type="MK_SALESAREA_PARAM" :dataMapping="{
                   marketingArea: 'id',

src/views/business/spd/bo/behavior/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="68px">
       <el-form-item label="任务编码" prop="taskCode">
         <el-input
           v-model="queryParams.taskCode"
@@ -126,13 +126,13 @@
         </el-divider>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="任务" prop="taskId" v-if="!(this.source == 'BoDetails')">
-              <el-input v-model="form.taskCode" placeholder="请输入任务" :disabled="this.source == 'TaskList'"/>
+            <el-form-item label="任务" prop="taskId">
+              <el-input v-model="form.taskCode"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="行动类型" prop="type">
-              <el-select v-model="form.type" placeholder="请输入行动类型">
+              <el-select v-model="form.type" placeholder="">
                 <el-option
                   v-for="dict in dict.type.mk_bo_behavior_type"
                   :key="dict.value"
@@ -148,7 +148,7 @@
                 v-model="form.time"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择行动日期">
+                placeholder="">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -156,19 +156,23 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="客户" prop="customerName">
-              <el-input v-model="form.customerName" placeholder="请输入客户" disabled="this.source == 'BoDetails' || this.source == 'TaskList'"/>
+              <el-input v-model="form.customerName"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系人" prop="linkmanName">
-              <el-input v-model="form.linkmanName" placeholder="请输入联系人" >
-                <el-button slot="append" icon="el-icon-more" @click="refereContact"></el-button>
-              </el-input>
+              <dr-popover-select v-model="form.linkmanName" title="联系人" type="LINKMAN_PARAM" :dataMapping="{
+                  linkman: 'id',
+                  linkmanName: 'name',
+                }" :source.sync="form"
+                :queryParams="additionalCondition"
+              >
+              </dr-popover-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="拜访目的" prop="purpose">
-              <el-select v-model="form.purpose" placeholder="请输入拜访目的">
+              <el-select v-model="form.purpose" placeholder="">
                 <el-option
                   v-for="dict in dict.type.mk_bo_behavior_goal"
                   :key="dict.value"
@@ -182,7 +186,7 @@
         <el-row>
           <el-col  :span="8">
             <el-form-item label="拜访效果" prop="result">
-              <el-select v-model="form.result" placeholder="请输入拜访效果">
+              <el-select v-model="form.result">
                 <el-option
                   v-for="dict in dict.type.mk_bo_behavior_res"
                   :key="dict.value"
@@ -194,7 +198,7 @@
           </el-col>
           <el-col  :span="8">
             <el-form-item label="是否上级协助" prop="assist">
-              <el-select v-model="form.assist" placeholder="请输入是否上级协助">
+              <el-select v-model="form.assist">
                 <el-option
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
@@ -206,33 +210,36 @@
           </el-col>
           <el-col  :span="8">
             <el-form-item label="协助内容" prop="assistContent" v-show="form.assist == 'Y'" :rules="form.assist == 'Y' ? rules.assistContent : [{require: false}]">
-              <el-input v-model="form.assistContent" placeholder="请输入协助内容" />
+              <el-input v-model="form.assistContent"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="销售区域" prop="marketingAreaName">
-              <el-input v-model="form.marketingAreaName" placeholder="请输入销售区域">
-                <el-button slot="append" icon="el-icon-more" @click="refereSaleaea"></el-button>
-              </el-input>
+              <dr-popover-select v-model="form.marketingAreaName" title="销售区域" type="MK_SALESAREA_PARAM" :dataMapping="{
+                  marketingArea: 'id',
+                  marketingAreaName: 'name',
+                }" :source.sync="form"
+              >
+              </dr-popover-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col  :span="8">
             <el-form-item label="销售组织" prop="salesOrgName">
-              <el-input v-model="form.salesOrgName" placeholder="请输入销售组织" :disabled="true"/>
+              <el-input v-model="form.salesOrgName" :disabled="true"/>
             </el-form-item>
           </el-col>
           <el-col  :span="8">
              <el-form-item label="部门" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门" :disabled="true"/>
+              <el-input v-model="form.deptName" :disabled="true"/>
             </el-form-item>
           </el-col>
           <el-col  :span="8">
             <el-form-item label="负责人" prop="staffName">
-              <el-input v-model="form.staffName" placeholder="请输入负责人" :disabled="true"/>
+              <el-input v-model="form.staffName" :disabled="true"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -252,6 +259,7 @@
         <el-divider content-position="left">
           <dev style="width: 50px; height: 40px; font-size: 18px">照片信息</dev>
         </el-divider>
+
         <el-upload
           action="actionUrl"
           list-type="picture-card"
@@ -272,12 +280,12 @@
             <dev style="width: 50px; height: 40px; font-size: 18px">签卡信息</dev>
           </el-divider>
           <el-table v-loading="loading" :data="form.behaviorXys" height="150px">
-            <el-table-column label="签卡类型" align="center" prop="type">
+            <el-table-column width="150" label="签卡类型" align="center" prop="type">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.mk_bo_signintype" :value="scope.row.type"/>
               </template>
             </el-table-column>
-            <el-table-column label="签卡时间" align="center" prop="createTime" />
+            <el-table-column width="150" label="签卡时间" align="center" prop="createTime" />
             <el-table-column label="签到地址" align="center" prop="address" />
           </el-table>
         </div>
@@ -310,10 +318,6 @@
           </el-row>
         </div>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="mini" type="primary" @click="submitForm" v-if="this.operatingState != 'Browse'" :disabled="submitButtonEditStatus">确 定</el-button>
-        <el-button size="mini" @click="cancel">取 消</el-button>
-      </div>
     </el-dialog>
   </div>
 </template>
@@ -326,6 +330,11 @@ export default {
   dicts: ['mk_bo_behavior_res','mk_bo_behavior_type','sys_yes_no','mk_bo_behavior_goal','mk_bo_signintype'],
   data() {
     return {
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+      actionUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址,
+      fileList: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -373,6 +382,41 @@ export default {
       dateRange: [],
       // 表单参数
       form: {},
+      // 表单校验
+      rules: {
+        type: [
+          { required: true, message: "行动类型不能为空", trigger: "blur" }
+        ],
+        time: [
+          { required: true, message: "行动日期不能为空", trigger: "blur" }
+        ],
+        customerName: [
+          { required: true, message: "客户不能为空", trigger: "blur" }
+        ],
+        linkmanName: [
+          { required: true, message: "联系人不能为空", trigger: "blur" }
+        ],
+        purpose: [
+          { required: true, message: "拜访目的不能为空", trigger: "blur" }
+        ],
+        assist: [
+          { required: true, message: "是否需要上级协助不能为空", trigger: "blur" }
+        ],
+        assistContent: [
+          { required: true, message: "协助内容不能为空", trigger: "blur" }
+        ],
+        staffName: [
+          { required: true, message: "负责人不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "洽谈内容不能为空", trigger: "blur" }
+        ],
+        result: [
+          { required: true, message: "拜访效果不能为空", trigger: "blur" }
+        ],
+      },
+      //当前操作状态
+      operatingState: '',
     };
   },
   created() {
@@ -380,6 +424,16 @@ export default {
     this.getList();
   },
   methods: {
+    uploadPic(file, fileList) {
+      this.fileList = fileList
+    },
+    handleRemove(file) {
+      this.fileList = this.fileList.filter(item => item.uid !== file.uid)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
     /** 查询行动列表 */
     getList() {
       this.loading = true;
@@ -456,6 +510,13 @@ export default {
         ...this.queryParams
       }, `behavior_${new Date().getTime()}.xlsx`)
     },
+    additionalCondition(){
+      return {
+        parame:{
+          customer: this.form.customer ? this.form.customer : 'xxx'
+        }
+      }
+    },
   }
 };
 </script>