Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!586

src/views/business/ehr/pm/performance/index.vue

@@ -7,6 +7,7 @@
             v-model="treeValue"
             :options="deptTree"
             :props="{ checkStrictly: true }"
+            ref="cascaderHandle"
             clearable
             @change="handleChange"
             >
@@ -352,6 +353,7 @@ export default {
     },
     //
     handleChange(value){
+      console.log("value",value);
       this.$refs.cascaderHandle.dropDownVisible = false;
     },
   }

src/views/business/ehr/pm/stagecontrol/detail.vue

@@ -27,23 +27,55 @@
               <div>{{ dict.label }}</div>
             </div>
           </el-descriptions-item>
+          <el-descriptions-item label="预计填写结束时间">{{form.month}}</el-descriptions-item>
+          <el-descriptions-item label="预计评分结束时间">{{form.month}}</el-descriptions-item>
         </el-descriptions>
         <el-form size="mini" label-position="right" ref="form" :model="form" :rules="formRules" :inline="true" class="demo-form-inline" v-if="pageState != 'see'">
           <el-row>
             <el-col span="6">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.name" :disabled="form.isPublish == 'Y'"></el-input>
               </el-form-item>
             </el-col>
             <el-col span="6">
-              <el-form-item label="月份" prop="yearMonth">
-                <el-date-picker type="month" value-format="yyyy-MM" v-model="form.month">
+              <el-form-item label="月份" prop="month">
+                <el-date-picker type="month" value-format="yyyy-MM" v-model="form.month" :disabled="form.isPublish == 'Y'">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col span="6">
+              <el-form-item label="状态" prop="stage">
+                <el-select size="mini" v-model="form.stage" placeholder="" :disabled="form.isPublish == 'Y'" >
+                  <el-option
+                    v-for="dict in dict.type.ehr_pm_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col span="6">
+              <el-form-item label="预计填写结束时间" prop="yearMonth">
+                <el-date-picker type="date" value-format="yyyy-MM" v-model="form.month">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col span="6">
+              <el-form-item label="预计评分结束时间" prop="yearMonth">
+                <el-date-picker type="date" value-format="yyyy-MM" v-model="form.month">
                 </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <div class="footer" v-if="form.isPublish == 'N'">
+        <el-tabs v-model="activeName" v-if="form.isPublish == 'Y'" @tab-click="btnTabs">
+          <el-tab-pane label="绩效列表" name="first">
+            绩效列表
+          </el-tab-pane>
+          <el-tab-pane label="等级参数" name="second">等级参数</el-tab-pane>
+        </el-tabs>
+        <div class="footer">
           <el-button type="primary" size="mini" @click="btnEdit" v-if="pageState == 'see'">修改</el-button>
           <el-button size="mini" plain @click="btnCancel" v-if="pageState != 'see'">取消</el-button>
           <el-button type="primary" :loading="loading" size="mini" @click="btnSave" v-if="pageState != 'see'">保存</el-button>
@@ -86,6 +118,8 @@ export default {
       loading: false,
       //页面状态
       pageState: null,
+      //当前页签
+      activeName: 'first'
     }
   },
   async created() {
@@ -390,6 +424,9 @@ export default {
         }
       });
     },
+    btnTabs(tab, event) {
+      console.log(tab, event);
+    },
   }
 }
 </script>

src/views/business/spd/target/MonthSaleGoal.vue

@@ -320,8 +320,9 @@
                       <div slot="content">{{ scope.row.memo }}</div>
                       <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].material" title="物料"
                         valueKey="name" referName="MATERIAL_PARAM"
-                        @change="setClassify(scope.row.oneLevelClassify, scope.row.twoLevelClassify, monthSaleGoalDetailsList[scope.$index])"
-                        :dataMapping="{ materialCode: 'code', material: 'name', oneLevelClassify: 'oneClass', twoLevelClassify: 'twoClass'}"
+                        @change="setClassify(scope.row.oneLevelClassify, scope.row.twoLevelClassify, monthSaleGoalDetailsList[scope.$index], scope.row)"
+                        :dataMapping="{ materialCode: 'code', material: 'name', oneLevelClassify: 'oneClass', twoLevelClassify: 'twoClass',
+                        specification: 'specification', packExplain: 'packExplain', model: 'model'}"
                         :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
                       </el-popover-select-v2>
                     </el-tooltip>
@@ -581,6 +582,9 @@
           twoLevelClassifyCode: null,
           twoLevelClassify: null,
           materialCode: null,
+          specification: null,
+          packExplain: null,
+          model: null,
           material: null,
           department: null,
           num: null,
@@ -809,6 +813,9 @@
           twoLevelClassifyCode: null,
           twoLevelClassify: null,
           materialCode: null,
+          specification: null,
+          packExplain: null,
+          model: null,
           material: null,
           department: null,
           num: null,
@@ -1096,9 +1103,12 @@
         this.$refs.upload.submit();
       },
       // 选择物料后，给一级分类和二级分类复赋值
-      setClassify(one, two, obj) {
+      setClassify(one, two, obj, row) {
         const oneArray = one.split("&")
         const twoArray = two.split("&")
+        // 物料提醒文本
+        const memo = '名称：' + row.material + '； 编码：' + row.materialCode + '； 规格：' + row.specification + '；  包装：' + row.packExplain + '； 型号：' + row.model + '。';
+        obj.memo = memo;
         obj.oneLevelClassifyCode = oneArray[1]
         obj.oneLevelClassify = oneArray[0]
         obj.twoLevelClassifyCode = twoArray[1]