Merge branch 'dev' into 'purchaseDev'

Dev

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

src/api/business/spd/goal_management/annualSaleGoal.js

@@ -29,7 +29,7 @@ export function addAnnualSaleGoal(data) {
 // 修改年度销售目标
 export function updateAnnualSaleGoal(data) {
   return request({
-    url: '/goal_management/annualSaleGoal',
+    url: '/goal_management/annualSaleGoal/edit',
     method: 'put',
     data: data
   })

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

@@ -849,7 +849,7 @@
           this.saveFormTwoPoint(this.form)
           this.annualSaleGoalDetailsList = this.form.annualGoalMergeDetails
           this.open = true;
-          this.title = "修改--年度销售目标";
+          this.title = "修改--年销售目标填报";
         });
       },
       // 复制按钮
@@ -887,6 +887,13 @@
         if (!this.justiceDetailsList()) {
           return this.$message.error('子表有必填字段没有赋值')
         }
+        for (let i = 0; i < this.annualSaleGoalDetailsList.length; i++) {
+          for (let j = i + 1; j < this.annualSaleGoalDetailsList.length; j++) {
+            if (this.annualSaleGoalDetailsList[i].materialCode == this.annualSaleGoalDetailsList[j].materialCode) {
+              return this.$message.error('子表存在重复物料');
+            }
+          }
+        }
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id != null) {

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

@@ -1037,7 +1037,9 @@
         this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString()
           .padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
         this.form.annual = new Date().getFullYear().toString()
+        this.form.creatorCode = this.$store.state.user.name
         this.form.creator = this.$store.state.user.nickName
+        this.form.deptId = this.$store.state.user.deptId
         this.form.dept = this.$store.state.user.deptName
       },
       handleAddDetails() {

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

@@ -59,7 +59,7 @@
         <el-col :span="6">
           <el-form-item label="部门" prop="dept">
             <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
-              :dataMapping="{ deptCode: 'code', dept: 'name'}" :source.sync="queryParams" placeholder="请输入部门">
+              :dataMapping="{ deptCode: 'id', dept: 'name'}" :source.sync="queryParams" placeholder="请输入部门">
             </el-popover-select-v2>
           </el-form-item>
         </el-col>
@@ -741,6 +741,9 @@
         listMonthGoalMerge(this.queryParams).then(response => {
           this.monthGoalMergeList = response.rows;
           this.total = response.total;
+          this.monthGoalMergeList.forEach(item => {
+            item.goalSum = item.goalSum.toFixed(2);
+          })
           this.loading = false;
         });
       },
@@ -848,7 +851,9 @@
         this.form.annual = new Date().getFullYear().toString()
         this.form.monthly = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(
           2, '0')
+        this.form.creatorCode = this.$store.state.user.name
         this.form.creator = this.$store.state.user.nickName
+        this.form.deptCode = this.$store.state.user.deptId
         this.form.dept = this.$store.state.user.deptName
       },
       handleAddDetails() {

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

@@ -71,7 +71,7 @@
         <el-col :span="6">
           <el-form-item label="部门" prop="dept">
             <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
-              :dataMapping="{ deptCode: 'code', dept: 'name'}" :source.sync="queryParams" placeholder="请输入部门"
+              :dataMapping="{ deptCode: 'id', dept: 'name'}" :source.sync="queryParams" placeholder="请输入部门"
               @keyup.enter.native="handleQuery">
             </el-popover-select-v2>
           </el-form-item>

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

@@ -76,7 +76,7 @@
         <el-col :span="6">
           <el-form-item label="部门" prop="dept">
             <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
-              :dataMapping="{ deptCode: 'code', dept: 'name'}" :source.sync="queryParams" placeholder="请输入部门">
+              :dataMapping="{ deptCode: 'id', dept: 'name'}" :source.sync="queryParams" placeholder="请输入部门">
             </el-popover-select-v2>
           </el-form-item>
         </el-col>
@@ -303,7 +303,7 @@
                 </el-table-column>
                 <el-table-column label="目标值（元）" align="center" prop="goalSum" width="220">
                   <template slot-scope="scope">
-                    <el-input-number @change="computeTotal" v-model="monthReturnMergeDetailsList[scope.$index].goalSum"
+                    <el-input-number disabled @change="computeTotal" v-model="monthReturnMergeDetailsList[scope.$index].goalSum"
                       :precision="2" :step="1" :min="0"></el-input-number>
                   </template>
                 </el-table-column>
@@ -709,7 +709,9 @@
         this.form.annual = new Date().getFullYear().toString()
         this.form.monthly = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(
           2, '0')
+        this.form.creatorCode = this.$store.state.user.name
         this.form.creator = this.$store.state.user.nickName
+        this.form.deptCode = this.$store.state.user.deptId
         this.form.dept = this.$store.state.user.deptName
       },
       handleAddDetails() {
@@ -867,7 +869,7 @@
         }
         mergeMonthReturnMergeDetails(this.form).then(response => {
           console.log(response)
-          if (response.data.monthReturnMergeDetails) {
+          if (response.data.monthReturnMergeDetails.length > 0) {
             this.monthReturnMergeDetailsList = response.data.monthReturnMergeDetails
             this.computeTotal()
           } else {

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

@@ -71,7 +71,7 @@
         <el-col :span="6">
           <el-form-item label="部门" prop="dept">
             <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
-              :dataMapping="{ deptCode: 'code', dept: 'name'}" :source.sync="queryParams" placeholder="请输入部门"
+              :dataMapping="{ deptCode: 'id', dept: 'name'}" :source.sync="queryParams" placeholder="请输入部门"
               @keyup.enter.native="handleQuery">
             </el-popover-select-v2>
           </el-form-item>
@@ -330,7 +330,7 @@
                     </el-date-picker>
                   </template>
                 </el-table-column>
-                <el-table-column label="目标值" align="center" prop="goalValue" width="220" :render-header="addRedStar">
+                <el-table-column label="目标值（元）" align="center" prop="goalValue" width="220" :render-header="addRedStar">
                   <template slot-scope="scope">
                     <el-input-number @change="computeTotal" v-model="monthSaleGoalDetailsList[scope.$index].goalValue"
                       :precision="2" :step="1" :min="0"></el-input-number>
@@ -837,6 +837,13 @@
         if (!this.justiceDetailsList()) {
           return this.$message.error('子表有必填字段未填，或者目标值为0')
         }
+        for (let i = 0; i < this.monthSaleGoalDetailsList.length; i++) {
+          for (let j = i + 1; j < this.monthSaleGoalDetailsList.length; j++) {
+            if (this.monthSaleGoalDetailsList[i].materialCode == this.monthSaleGoalDetailsList[j].materialCode) {
+              return this.$message.error('子表存在重复物料');
+            }
+          }
+        }
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id != null) {

src/views/business/spd/target/targetMk/index.vue

@@ -319,6 +319,9 @@
       //查询列表
       getList(params) {
         this.loading = true;
+        if (this.dateRange[1] != null) {
+          this.dateRange[1] = this.dateRange[1] + ' 23:59:59'
+        }
         listTarget(this.addDateRange(params, this.dateRange)).then(res => {
           if (res.code === 200) {
             this.tableList = res.rows;

src/views/business/spd/target/targetMk/item.vue

@@ -70,7 +70,8 @@
         <el-table-column show-overflow-tooltip v-if="head.children" v-for="headChi in head.children" :prop="headChi.prop" :label="headChi.modelName" width="150" align="center">
           <template slot-scope="scope">
             <div v-if="pageStu == 'add' || pageStu == 'edit'">
-              <el-input size="mini" v-model="scope.row[headChi.prop].value" class="input-view" oninput="value=value.replace(/[^0-9]/g,'')"></el-input>
+              <!-- <el-input size="mini" v-model="scope.row[headChi.prop].value" class="input-view" oninput="value=value.replace(/[^0-9]/g,'')"></el-input> -->
+              <el-input-number size="mini" v-model="scope.row[headChi.prop].value" :precision="2" class="input-view" oninput="value=value.replace(/[^0-9]/g,'')"></el-input-number>
             </div>
             <div v-else-if="pageStu == 'see'">
               {{scope.row[headChi.prop].value}}

src/views/business/spd/target/targetTemplate/detail.vue

@@ -460,6 +460,7 @@ export default {
             start.setDate(start.getDate()+1);
           }
         }
+        cycles[cycles.length - 1].deadlineTime = deadline;
       }
       this.form.cycles = cycles;
       console.log('this.form.cycles',this.form.cycles);