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

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

@@ -1302,11 +1302,11 @@
         <el-form-item label="丢单金额（万元）" prop="winningStateMoney" v-if="this.winningStateData.winningState == '2'">
           <el-input type="number" v-model="winningStateData.winningStateMoney" style="width:220px" placeholder="丢单金额"/>
         </el-form-item>
-        <el-form-item label="关闭原因" prop="winningStateCause" v-if="this.winningStateData.winningState == '2'">
-          <el-input v-model="winningStateData.winningStateCause" style="width:220px" placeholder="请输入关闭原因"/>
+        <el-form-item label="丢单原因" prop="winningStateCause" v-if="this.winningStateData.winningState == '2'">
+          <el-input v-model="winningStateData.winningStateCause" style="width:220px" placeholder="请输入丢单原因"/>
         </el-form-item>
-        <el-form-item label="关闭备注" prop="winningStateRemark" v-if="this.winningStateData.winningState == '2'">
-          <el-input v-model="winningStateData.winningStateRemark" style="width:220px" placeholder="请输入关闭备注"/>
+        <el-form-item label="丢单备注" prop="winningStateRemark" v-if="this.winningStateData.winningState == '2'">
+          <el-input v-model="winningStateData.winningStateRemark" style="width:220px" placeholder="请输入丢单备注"/>
         </el-form-item>
         <!-- 关闭 -->
         <el-form-item label="关闭原因" prop="winningStateCause" v-if="this.winningStateData.winningState == '1'">

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

@@ -50,7 +50,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="赢单状态" prop="winningState">
+      <!-- <el-form-item label="赢单状态" prop="winningState">
         <el-select v-model="queryParams.winningState" placeholder="请输入赢单状态" clearable>
           <el-option
             v-for="dict in dict.type.mk_bo_winstate"
@@ -59,7 +59,7 @@
             :value="dict.value"
           ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="客户名称" prop="customerName">
         <el-input
           v-model="queryParams.customerName"
@@ -198,7 +198,9 @@
     <!-- 添加或修改商机基础信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-divider content-position="left" style="font-size: 30px">基本信息</el-divider>
+        <el-divider content-position="left">
+          <dev style="width: 50px; height: 40px; font-size: 18px">基本信息</dev>
+        </el-divider>
         <el-row>
           <el-col :span="8">
             <el-form-item label="商机名称" prop="boName">
@@ -280,7 +282,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-divider content-position="left" style="font-size: 30px">其它信息</el-divider>
+        <el-divider content-position="left">
+          <dev style="width: 50px; height: 40px; font-size: 18px">其它信息</dev>
+        </el-divider>
         <el-row>
           <el-col :span="6">
             <el-form-item label="销售区域" prop="marketingAreaName">
@@ -425,7 +429,7 @@ export default {
         boSource: [
           { required: true, message: "商机来源不能为空", trigger: "blur" }
         ],
-        referrer: [
+        referrerName: [
           { required: true, message: "推荐人不能为空", trigger: "blur" }
         ],
         boType: [

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

@@ -398,8 +398,6 @@ export default {
   data() {
     return {
       fileList: [
-        'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
-        'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg'
       ],
       // 遮罩层
       loading: true,

src/views/business/spd/bo/pojpsn/pojpsnList.vue

@@ -8,7 +8,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -18,7 +19,8 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -28,46 +30,77 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="pojpsnList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="pojpsnList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-      <el-table-column label="商机名称" align="center" prop="boName" v-if="source == 'Pojpsn'"/>
+      <el-table-column
+        label="商机名称"
+        align="center"
+        prop="boName"
+        v-if="source == 'Pojpsn'"
+      />
       <el-table-column label="员工名称" align="center" prop="staffName" />
-      <el-table-column label="项目岗位" align="center" prop="post" >
+      <el-table-column label="项目岗位" align="center" prop="post">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mk_bo_pojpsn_post" :value="scope.row.post"/>
+          <dict-tag
+            :options="dict.type.mk_bo_pojpsn_post"
+            :value="scope.row.post"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="职责" align="center" prop="job" >
+      <el-table-column label="职责" align="center" prop="jobs" width="400">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mk_bo_pojpsn_job" :value="scope.row.job"/>
+          <el-select v-model="scope.row.jobs" multiple disabled size="medium">
+            <el-option
+              v-for="dict in dict.type.mk_bo_pojpsn_job"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            >
+            </el-option>
+          </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        fixed="right"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -81,8 +114,16 @@
           <el-input v-model="form.boName" placeholder="商机名称" />
         </el-form-item> -->
         <el-form-item label="员工" prop="staffName">
-          <el-input v-model="form.staffName" :disabled="this.operatingState != 'Insert'">
-            <el-button slot="append" icon="el-icon-more" @click="refereStaff" :disabled="this.operatingState != 'Insert'"></el-button>
+          <el-input
+            v-model="form.staffName"
+            :disabled="this.operatingState != 'Insert'"
+          >
+            <el-button
+              slot="append"
+              icon="el-icon-more"
+              @click="refereStaff"
+              :disabled="this.operatingState != 'Insert'"
+            ></el-button>
           </el-input>
         </el-form-item>
         <el-form-item label="项目岗位" prop="post">
@@ -101,7 +142,8 @@
               v-for="dict in dict.type.mk_bo_pojpsn_job"
               :key="dict.value"
               :label="dict.label"
-              :value="dict.value">
+              :value="dict.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -121,14 +163,20 @@
 </template>
 
 <script>
-import { listPojpsn, getPojpsn, delPojpsn, addPojpsn, updatePojpsn } from "@/api/business/spd/bo/pojpsn";
-import StaffRef from '@/views/business/spd/bo/refer/staff/index.vue';
+import {
+  listPojpsn,
+  getPojpsn,
+  delPojpsn,
+  addPojpsn,
+  updatePojpsn,
+} from "@/api/business/spd/bo/pojpsn";
+import StaffRef from "@/views/business/spd/bo/refer/staff/index.vue";
 
 export default {
   name: "pojpsnList",
-  props:["source","bo"],
-  dicts: ['mk_bo_pojpsn_post','mk_bo_pojpsn_job'],
-  components: {StaffRef},
+  props: ["source", "bo"],
+  dicts: ["mk_bo_pojpsn_post", "mk_bo_pojpsn_job"],
+  components: { StaffRef },
   data() {
     return {
       // 遮罩层
@@ -164,33 +212,30 @@ export default {
       // 表单校验
       rules: {
         staffName: [
-          { required: true, message: "员工不能为空", trigger: "blur" }
-        ],
-        post: [
-          { required: true, message: "岗位不能为空", trigger: "blur" }
-        ],
-        jobs: [
-          { required: true, message: "职责不能为空", trigger: "blur" }
+          { required: true, message: "员工不能为空", trigger: "blur" },
         ],
+        post: [{ required: true, message: "岗位不能为空", trigger: "blur" }],
+        jobs: [{ required: true, message: "职责不能为空", trigger: "blur" }],
       },
       //当前操作状态
-      operatingState: '',
+      operatingState: "",
     };
   },
   created() {
-    if(this.source == 'Pojpsn'){
+    if (this.source == "Pojpsn") {
       this.queryParams = this.bo;
     }
-    if(this.source == 'BoDetails'){
+    if (this.source == "BoDetails") {
       this.queryParams.bo = this.bo.id;
     }
     this.getList();
+    console.log("dict.type.mk_bo_pojpsn_job", this.dict.type.mk_bo_pojpsn_job);
   },
   methods: {
     /** 查询项目成员列表 */
     getList() {
       this.loading = true;
-      listPojpsn(this.queryParams).then(response => {
+      listPojpsn(this.queryParams).then((response) => {
         this.pojpsnList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -218,7 +263,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        delFlag: null
+        delFlag: null,
       };
       this.resetForm("form");
     },
@@ -234,15 +279,15 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.operatingState = "Insert";
       this.reset();
-      if(this.source == 'BoDetails'){
+      if (this.source == "BoDetails") {
         this.form.bo = this.bo.id;
         this.form.boName = this.bo.boName;
       }
@@ -253,8 +298,8 @@ export default {
     handleUpdate(row) {
       this.operatingState = "Update";
       this.reset();
-      const id = row.id || this.ids
-      getPojpsn(id).then(response => {
+      const id = row.id || this.ids;
+      getPojpsn(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改项目成员";
@@ -262,16 +307,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updatePojpsn(this.form).then(response => {
+            updatePojpsn(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPojpsn(this.form).then(response => {
+            addPojpsn(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -283,29 +328,37 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除项目成员编号为"' + ids + '"的数据项？').then(function() {
-        return delPojpsn(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除项目成员编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delPojpsn(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/pojpsn/export', {
-        ...this.queryParams
-      }, `pojpsn_${new Date().getTime()}.xlsx`)
+      this.download(
+        "system/pojpsn/export",
+        {
+          ...this.queryParams,
+        },
+        `pojpsn_${new Date().getTime()}.xlsx`
+      );
     },
     // 触发员工参照列表
     refereStaff() {
-      console.log('测试点击')
-      this.$refs.contractSelect.init()
+      console.log("测试点击");
+      this.$refs.contractSelect.init();
     },
     //员工参照列表选择后
-    selectionsToInput (selections) {
+    selectionsToInput(selections) {
       this.form.staff = selections[0].userId;
       this.form.staffName = selections[0].nickName;
-    }
-  }
+    },
+  },
 };
 </script>

src/views/material/changeApply/add.vue

@@ -701,6 +701,12 @@ export default {
             this.basicForm2.medicalDevices = data.medcines[0].medicalInstruments
             this.basicForm2.maintenanceType = data.medcines[0].curingType
           }
+          // 控制医药属性是否能够填写
+          if (this.basicForm.medicineMaterial == '0') {
+            this.isControl = false
+          } else {
+            this.isControl = true
+          }
         }
       })
     },