update

src/pages/main/demandDevelop/index.vue

@@ -83,7 +83,7 @@
       :fullscreen="true"
       :key="number"
     >
-      <div v-loading="loadinged">
+      <div v-loading="loadinged" class="simple-dialog">
         <el-form :model="infolist" ref="infolist" :rules="rules">
           <div class="info-line">
             <el-form-item prop="demandName">
@@ -218,6 +218,7 @@
           <div v-if="!disableStatus" class="info-line online">
             <span style="width: 80px">附件</span>
             <el-upload
+              class="info-upload"
               :limit="3"
               action=""
               :on-preview="handlePreview"
@@ -229,9 +230,9 @@
             >
               <div class="upload">
                 <i class="el-icon-upload"></i>
-                <div class="el-upload__text">
+                <p class="el-upload__text">
                   将文件拖到此处，或<em>点击上传</em>
-                </div>
+                </p>
               </div>
             </el-upload>
           </div>
@@ -332,7 +333,7 @@
           </div>
         </el-form>
 
-        <div slot="footer" class="dialog-footer myfooter">
+        <div slot="footer" class="info-footer">
           <div v-if="titname === '添加' || step === '0'">
             <el-button type="primary" @click="handleApprove('送部门人员审核')"
               >送部门人员审核</el-button
@@ -373,6 +374,7 @@
             >
             <el-button @click="handleApprove('取消')">取消</el-button>
           </div>
+          <el-button @click="handleApprove('取消')">取消</el-button>
           <!-- <el-button
             v-if="titname != '查看' && vision == '流程发起'"
             type="primary"
@@ -457,7 +459,9 @@
         </div>
       </div>
     </el-dialog>
-
+    <el-dialog title="选择审批领导" :visible.sync="checkLaeder" width="500px">
+      <div>aaa</div>
+    </el-dialog>
     <myMessage
       :messTit="messTit"
       @closeMessage="closeMessage"
@@ -512,9 +516,11 @@ export default {
       // 按钮标识
       type: "",
       // 联系人
+      checkLaeder: false,
       checkexa: false,
       // 信息回显
       infolist: {},
+      // 用户信息
       userInfo: {},
       params: {},
       centerDialogVisible: false,
@@ -629,7 +635,7 @@ export default {
             case "送领导审核":
               this.type = "1";
               // this.formSubmit()
-              this.checkexa = true;
+              this.checkLaeder = true;
               console.log("送领导审核");
               break;
             case "送申请人编号发送":
@@ -639,32 +645,32 @@ export default {
               this.handleComfirmNo();
               break;
             case "打回":
-              this.handleBackRecord()
+              this.handleBackRecord();
               break;
           }
         }
       });
     },
     // 打回方法
-    handleBackRecord(){
+    handleBackRecord() {
       this.$http({
-        url:'/market/mkOnlineChannel/backRecord',
+        url: "/market/mkOnlineChannel/backRecord",
         method: "get",
         headers: {
           "Content-Type": "application/json",
         },
         params: {
           woNo: this.woNo,
-          remark: this.remark
+          remark: this.remark,
         },
       }).then(({ data: { desc } }) => {
         console.log(desc);
-        if(desc === '操作成功'){
-          this.$message.success('操作成功')
+        if (desc === "操作成功") {
+          this.$message.success("操作成功");
           this.dialogStatus = false;
           this.handleInit();
-        }else{
-          this.$message.error('操作失败')
+        } else {
+          this.$message.error("操作失败");
         }
       });
     },
@@ -744,12 +750,12 @@ export default {
         },
       }).then(({ data: { desc } }) => {
         console.log(desc);
-        if(desc === '操作成功'){
-          this.$message.success('操作成功')
+        if (desc === "操作成功") {
+          this.$message.success("操作成功");
           this.dialogStatus = false;
           this.handleInit();
-        }else{
-          this.$message.error('操作失败')
+        } else {
+          this.$message.error("操作失败");
         }
       });
     },
@@ -762,15 +768,14 @@ export default {
           "Content-Type": "application/json",
         },
         data: this.woNo,
-        
       }).then(({ data: { desc } }) => {
-        console.log(desc)
-        if(desc === '操作成功'){
-          this.$message.success('操作成功')
+        console.log(desc);
+        if (desc === "操作成功") {
+          this.$message.success("操作成功");
           this.dialogStatus = false;
           this.handleInit();
-        }else{
-          this.$message.error('操作失败')
+        } else {
+          this.$message.error("操作失败");
         }
       });
     },
@@ -823,13 +828,17 @@ export default {
           this.datalist.attList = mkOnlineChannel.attList;
           this.woNo = mkOnlineChannel.woNo;
           this.step = mkOnlineChannel.step;
-          this.infodatas = mkOnlineChannel.logList
-          if(this.step === '0'){
-            this.visionsts = ''
-            this.disableStatus = false
-          }else{
+          this.infodatas = mkOnlineChannel.logList;
+          if (this.titname === "查看") {
+            this.disableStatus = true;
+            return;
+          }
+          if (this.step === "0") {
+            this.visionsts = "";
+            this.disableStatus = false;
+          } else {
             this.disableStatus = true;
-            this.visionsts = '2'
+            this.visionsts = "2";
           }
         }
       );
@@ -1443,7 +1452,25 @@ export default {
   margin-bottom: 20px;
   padding: 0 20px;
 }
-
+.simple-dialog {
+  position: relative;
+  min-height: 90vh;
+}
+.info {
+  &-footer {
+    position: absolute;
+    clear: both;
+    border: 1px solid red;
+    bottom: 20px;
+    display: flex;
+    left: 0;
+    right: 0;
+    justify-content: flex-end;
+  }
+  &-upload {
+    width: 500px !important;
+  }
+}
 .titbox {
   div {
     float: right;
@@ -1457,12 +1484,10 @@ export default {
 }
 .upload {
   position: relative;
-  left: 200px;
-  top: 0px;
-  line-height: 100px;
+  left: calc(50% - 229px / 2);
+  vertical-align: middle;
   display: flex !important;
-  align-items: center !important;
-  justify-content: center !important;
+  flex-direction: column;
 }
 .tabbox {
   margin-top: 15px;
@@ -1540,7 +1565,6 @@ export default {
       border-bottom: 1px solid #fff;
     }
   }
-
   .treeUserb {
     width: calc(100% - 100px);
     border: 1px solid #ddd;

src/pages/main/performance/components/sheet.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-01-20 18:03:26
+ * @LastEditTime: 2022-01-21 18:55:09
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 
@@ -228,11 +228,46 @@
       :modal="false"
       @cancel="handleApprove"
     >
+      <el-form
+        :model="approveForm"
+        label-width="120px"
+        :rules="{
+          required: true,
+          message: '请选择审批意见',
+          trigger: 'change',
+        }"
+      >
+        <el-form-item label="审批意见：">
+          <el-select v-model="approveForm.type">
+            <el-option
+              v-for="item in approveForm.list"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="approveForm.type === '3'"
+          label="其它审批意见："
+          :rules="{
+            required: true,
+            message: '请输入审批意见',
+            trigger: 'blur',
+          }"
+          ><el-input v-model="approveForm.comments"
+        /></el-form-item>
+      </el-form>
       <template v-slot:footer>
         <div>
           <el-button @click.prevent="handleApprove('1')">结束</el-button>
-          <el-button @click.prevent="handleApprove('4')" type="primary">转副总审批</el-button>
-          <el-button @click.prevent="handleApprove('3')" type="primary">转总经理审批</el-button>
+          <el-button @click.prevent="handleApprove('4')" type="primary"
+            >转副总审批</el-button
+          >
+          <el-button @click.prevent="handleApprove('3')" type="primary"
+            >转总经理审批</el-button
+          >
         </div>
       </template>
     </simpleDialog>
@@ -272,7 +307,6 @@ export default {
             row_end: "",
           },
         ],
-
         array: [],
         type: null,
 
@@ -282,6 +316,24 @@ export default {
         row_start: "",
         row_end: "",
       },
+      approveForm: {
+        type: "",
+        comments: "",
+        list: [
+          {
+            label: "同意",
+            value: "1",
+          },
+          {
+            label: "不同意",
+            value: "2",
+          },
+          {
+            label: "其他",
+            value: "3",
+          },
+        ],
+      },
       // 可提交标志
       addFlag: "0",
       isDisable: true,
@@ -731,7 +783,11 @@ export default {
             issuedId: this.issued_id,
           },
         });
-        let params = { id: this.issued_id };
+        let params = {
+          id: this.issued_id,
+          reviewOpinion:
+            this.approveForm.type === "3" ? this.approveForm.comments : this.approveForm.type,
+        };
         switch (type) {
           case "1":
             params = {

src/pages/main/performance/department.vue

@@ -105,12 +105,27 @@
       class="approve"
       @cancel="handleCancel('approve_visible')"
     >
-      <el-form :model="approveForm" ref="approveForm"
-        ><el-form-item label="审批意见" prop="comments" label-width="80px"
-          ><el-input
-            type="textarea"
-            v-model="approveForm.comments"
-            autosize /></el-form-item
+      <el-form :model="approveForm" ref="approveForm">
+        <el-form-item label="审批意见：">
+          <el-select v-model="approveForm.type">
+            <el-option
+              v-for="item in approveForm.list"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="approveForm.type === '3'"
+          label="其它审批意见："
+          :rules="{
+            required: true,
+            message: '请输入审批意见',
+            trigger: 'blur',
+          }"
+          ><el-input v-model="approveForm.comments" /></el-form-item
       ></el-form>
       <template v-slot:footer
         ><div>
@@ -384,7 +399,24 @@ export default {
         ],
       },
       // 审批意见
-      approveForm: { comments: "" },
+      approveForm: {
+        type: "",
+        comments: "",
+        list: [
+          {
+            label: "同意",
+            value: "1",
+          },
+          {
+            label: "不同意",
+            value: "2",
+          },
+          {
+            label: "其他",
+            value: "3",
+          },
+        ],
+      },
       trackList: [],
       //   顶部form
       table_form: [
@@ -812,7 +844,10 @@ export default {
       let request = 0;
       let reqdata = {
         id: this.edit_form.id,
-        reviewOpinion: this.approveForm.comments,
+        reviewOpinion:
+          this.approveForm.type === "3"
+            ? this.approveForm.comments
+            : this.approveForm.type,
       };
       switch (type) {
         case "finish":