Merge branch 'dev' into 'purchaseDev'

Dev

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

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

@@ -50,4 +50,13 @@ export function submit(id) {
     method: 'post',
     data: id
   })
+}
+
+//重新提交
+export function resubmit(id) {
+  return request({
+    url: '/goal_management/annualSaleGoal/resubmit',
+    method: 'post',
+    data: id
+  })
 }

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

@@ -137,9 +137,12 @@
           <el-button v-if="scope.row.status == '0' || scope.row.status == '3'" size="mini" type="text"
             @click="handleDelete(scope.row)">删除
           </el-button>
-          <el-button v-if="scope.row.status == '0' || scope.row.status == '3'" size="mini" type="text"
+          <el-button v-if="scope.row.status == '0' && (scope.row.flowId == null || scope.row.flowId == '')" size="mini" type="text"
             @click="handleSubmit(scope.row)">提交
           </el-button>
+          <el-button v-if="(scope.row.status == '0' || scope.row.status == '3') && !(scope.row.flowId == null || scope.row.flowId == '')" size="mini" type="text"
+            @click="handleResubmit(scope.row)">重新提交
+          </el-button>
           <el-button v-if="scope.row.status == '1'" size="mini" type="text" @click="handleReback(scope.row)">收回
           </el-button>
         </template>
@@ -207,7 +210,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="目标合计（元）" prop="goalTotal">
+            <el-form-item label="目标合计（元）" prop="goalTotal" label-width="120px">
               <el-input v-model="form.goalTotal" placeholder="目标合计自动计算" clearable disabled />
             </el-form-item>
           </el-col>
@@ -227,7 +230,7 @@
         </el-row>
 
         <div id="addDetails">
-          <el-row :gutter="10" class="mb8" style="margin-left: 80%">
+          <el-row :gutter="10" class="mb8" style="margin-left: 75%">
             <el-col :span="1.5">
               <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载
               </el-button>
@@ -659,6 +662,7 @@
     addAnnualSaleGoal,
     updateAnnualSaleGoal,
     submit,
+    resubmit,
   } from "@/api/business/spd/goal_management/annualSaleGoal";
   import {
     delAnnualSaleGoalDetails,
@@ -1321,6 +1325,25 @@
           this.$modal.closeLoading();
         }
       },
+      //重新提交
+      async handleResubmit(row) {
+        this.$modal.loading("提交中...");
+        try {
+          const {
+            msg,
+            code
+          } = await resubmit(row.id);
+          if (code === 200) {
+            this.$modal.notifySuccess("提交成功");
+            this.$modal.closeLoading();
+            row.status = '1'
+            // this.getList(this.queryParams)
+          }
+        } catch (err) {
+          console.error(err);
+          this.$modal.closeLoading();
+        }
+      },      
       //收回
       handleReback(row) {
         this.$modal.loading("收回中...");

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

@@ -220,7 +220,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="目标值汇总（元）" prop="goalTotal">
+            <el-form-item label="目标合计（元）" prop="goalTotal" label-width="120px">
               <el-input v-model="form.goalTotal" placeholder="目标值汇总自动计算" disabled />
             </el-form-item>
           </el-col>

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

@@ -232,8 +232,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="目标值合计（元）" prop="goalSum">
-              <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled />
+            <el-form-item label="目标合计（元）" prop="goalSum" label-width="120px">
+              <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -325,7 +325,7 @@
                     </el-popover-select-v2>
                   </template>
                 </el-table-column>
-                <el-table-column label="科室" align="center" prop="department" width="180">
+                <el-table-column label="科室" align="center" width="180">
                   <template slot-scope="scope">
                     <el-input v-model="monthGoalMergeDetailsList[scope.$index].department" placeholder="请输入科室" disabled>
                     </el-input>

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

@@ -204,7 +204,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="目标合计（元）" prop="goalSum">
+            <el-form-item label="目标合计（元）" prop="goalSum" label-width="120px">
               <el-input v-model="form.goalSum" placeholder="目标合计自动计算" disabled />
             </el-form-item>
           </el-col>
@@ -223,7 +223,7 @@
           </el-col>
         </el-row>
         <div>
-          <el-row :gutter="10" class="mb8" style="margin-left: 80%">
+          <el-row :gutter="10" class="mb8" style="margin-left: 75%">
             <el-col :span="1.5">
               <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载
               </el-button>

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

@@ -124,7 +124,7 @@
       <el-table-column label="制单人" align="center" prop="creator" width="180" />
       <el-table-column label="部门" align="center" prop="dept" width="180" />
       <el-table-column label="目标类型" align="center" prop="goalCategory" width="180" />
-      <el-table-column label="目标值合计（元）" align="center" prop="goalSum" width="180" />
+      <el-table-column label="目标合计（元）" align="center" prop="goalSum" width="180" />
       <el-table-column show-overflow-tooltip label="状态" align="center" width="100" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_status" :value="scope.row.status" />
@@ -223,12 +223,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="目标值合计（元）" prop="goalSum">
+            <el-form-item label="目标合计（元）" prop="goalSum" label-width="120px">
               <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="单据状态" prop="type">
               <el-select v-model="form.status" placeholder="" disabled>

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

@@ -207,7 +207,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="目标合计（元）" prop="goalSum">
+            <el-form-item label="目标合计（元）" prop="goalSum" label-width="120px">
               <el-input v-model="form.goalSum" placeholder="目标合计自动计算" disabled />
             </el-form-item>
           </el-col>
@@ -226,7 +226,7 @@
           </el-col>
         </el-row>
         <div>
-          <el-row :gutter="10" class="mb8" style="margin-left: 80%">
+          <el-row :gutter="10" class="mb8" style="margin-left: 75%">
             <el-col :span="1.5">
               <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载
               </el-button>

src/views/monitor/system/index.vue

@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="OA对应单据信息" prop="oaIdentity">
-        <el-input
-          v-model="queryParams.oaIdentity"
-          placeholder="请输入OA对应单据信息"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="来源系统">
         <el-select clearable v-model="queryParams.busDomain" size="mini" style="width: 200px"
                    @keyup.enter.native="handleQuery" clearable>
@@ -17,15 +9,21 @@
           </el-option>
         </el-select>
       </el-form-item>
-
+      <el-form-item label="OA单据信息" prop="oaIdentity">
+        <el-input
+          v-model="queryParams.oaIdentity"
+          placeholder="请输入OA对应单据信息"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery" plain>搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" type="info" @click="resetQuery" plain>重置</el-button>
         <el-button icon="el-icon-video-play" size="mini" type="success" @click="getDatas" plain>更新数据</el-button>
       </el-form-item>
-
     </el-form>
-    <el-table v-loading="loading" :data="serviceList">
+    <el-table v-loading="loading" :data="serviceList" border :height="tableHeight">
       <el-table-column label="业务域" min-width="120" align="center" prop="busDomain" :formatter="formatterBusDomain"/>
       <el-table-column label="业务类型" min-width="120" align="center" prop="monitorType">
         <template slot-scope="scope">
@@ -34,8 +32,7 @@
         </template>
       </el-table-column>
       <el-table-column label="OA单据信息" min-width="80" align="center" prop="oaIdentity"/>
-      <el-table-column label="业务域单据信息" min-width="120" align="center" prop="docIdentity"
-                       :show-overflow-tooltip="true"/>
+      <el-table-column label="业务域单据信息" min-width="120" align="center" prop="docIdentity"/>
       <el-table-column label="所属模块" min-width="80" align="center" prop="busModule" :show-overflow-tooltip="true"/>
       <el-table-column label="状态释意" min-width="80" align="center" prop="busStatusName"/>
       <el-table-column label="问题原因" min-width="150" align="center" prop="errorMsg"/>
@@ -67,6 +64,15 @@
 
   export default {
     dicts: ['oa_todo_type', 'oa_nc_bill_type', 'oa_flow_status', 'oa_busdomian_desc'],
+    computed: {
+      tableHeight:{
+        get(){
+          console.log(window,'window');
+          return window.innerHeight - 220;
+        },
+        set(){},
+      }
+    },
     data() {
       return {
         //遮罩层
@@ -163,6 +169,8 @@
       },
       //重置
       resetQuery() {
+        this.queryParams.busDomain = ''
+        this.queryParams.oaIdentity = ''
         this.resetForm("queryForm");
         this.handleQuery();
       }