Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/views/business/spd/bo/basic/bocontactList.vue

@@ -227,14 +227,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="擅长领域" prop="fieldExpertise">
-              <el-select v-model="form.fieldExpertise" placeholder="">
-                <el-option
-                  v-for="dict in dict.type.mk_bo_field_expertise"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
+              <el-input v-model="form.fieldExpertise" />
             </el-form-item>
           </el-col>
           <el-col :span="8">

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

@@ -267,14 +267,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="擅长领域" prop="fieldExpertise">
-              <el-select v-model="form.fieldExpertise" placeholder="">
-                <el-option
-                  v-for="dict in dict.type.mk_bo_field_expertise"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
+              <el-input v-model="form.fieldExpertise" />
             </el-form-item>
           </el-col>
           <el-col :span="8">

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

@@ -56,7 +56,7 @@
           <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
           <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
-          <el-table-column label="创建日期" align="center" prop="createTime" >
+          <el-table-column width="100" label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
             </template>
@@ -125,7 +125,7 @@
           <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
           <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
-          <el-table-column label="创建日期" align="center" prop="createTime" >
+          <el-table-column width="100" label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
             </template>
@@ -202,7 +202,7 @@
           <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
           <el-table-column width="200" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
-          <el-table-column label="创建日期" align="center" prop="createTime" >
+          <el-table-column width="100" label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
             </template>
@@ -295,7 +295,7 @@
           <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
           <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
-          <el-table-column label="创建日期" align="center" prop="createTime" >
+          <el-table-column width="100" label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
             </template>
@@ -372,7 +372,7 @@
           <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
           <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
-          <el-table-column label="创建日期" align="center" prop="createTime" >
+          <el-table-column width="100" label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
             </template>
@@ -449,7 +449,7 @@
           <el-table-column show-overflow-tooltip label="部门" align="center" prop="deptName" />
           <el-table-column label="商机预估值(万元)" align="center" prop="hosDiscreetValue"/>
           <el-table-column width="300" show-overflow-tooltip label="商机内容" align="center" prop="boContent"/>
-          <el-table-column label="创建日期" align="center" prop="createTime" >
+          <el-table-column width="100" label="创建日期" align="center" prop="createTime" >
             <template slot-scope="scope">
               {{new Date(scope.row.createTime).Format("yyyy-MM-dd")}}
             </template>

src/views/expend/expendMxDetail.vue

@@ -93,6 +93,19 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="是否汇总" prop="isSum">
+              <el-select style="width: 200px" size="mini" :disabled="sonDisable" clearable v-model="basicForm.isSum" placeholder="请选择">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
             <el-form-item label="备注" prop="remark">
               <el-input style="width: 200px" clearable :disabled="sonDisable" size="mini" v-model="basicForm.remark">
               </el-input>
@@ -183,9 +196,11 @@ export default {
         startDate: '',
         endDate: '',
         totalAmount: '',
+        isSum: '',
         remark: '',
         itemList: []
       },
+      options: [{value: '0', label: '是'}, {value: '2', label: '否'}],
       basicRules: {},
       ids:[],
     }