From 1ae1f89fa52c3579735fbfe5f13afb5c2bb6e8cc Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 5 Apr 2022 21:07:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E5=8C=85=E8=A3=85=202022=E5=B9=B44?=
 =?UTF-8?q?=E6=9C=885=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherReport/change_switch_roll.vue        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/yieldReport/otherReport/change_switch_roll.vue b/src/views/modules/yieldReport/otherReport/change_switch_roll.vue
index e4e3d8d..0992eb8 100644
--- a/src/views/modules/yieldReport/otherReport/change_switch_roll.vue
+++ b/src/views/modules/yieldReport/otherReport/change_switch_roll.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="customer-css">
-    <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
+    <el-dialog    @close="closeDialog" :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
                width="300px" style="height: 680px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" style="height: 60px;"
                label-width="80px">
         <!-- 半成品卷卷号 -->
         <el-row>
-          <el-col :span="24" style="margin-left: 0px;">
+          <el-col :span="24" style="margin-left: 0px;margin-top: -5px">
             <el-form-item :label="'产品卷号:'">
               <el-input ref="newRollNo" v-model="pageData.newRollNo" style="width: 208px;" ></el-input>
             </el-form-item>
@@ -14,7 +14,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24" style="margin-left: 0px;">
+          <el-col :span="24" style="margin-left: 0px; margin-top: -5px;margin-bottom: 10px;">
             <el-form-item label="排产日期:">
               <el-date-picker style="width: 100px"
                               format="yyyy-MM-dd"
@@ -34,7 +34,7 @@
 
 
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span style="margin-top: 20px" slot="footer" class="dialog-footer">
         <el-button type="primary" @click="switchRollBun">确 定</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
@@ -138,7 +138,7 @@ export default {
     searchScheduleDateShift() {
       getScheduleDateShift(this.scheduleDateShiftDto).then(({data}) => {
         if (data.code == 0) {
-          this.currentDate = data.map.scheduleddate
+          this.currentDate = data.map.scheduleddate?data.map.scheduleddate:this.scheduleDateShiftDto.currentDateTime
           this.shift = data.map.ShiftNo
         }
       })
@@ -193,6 +193,7 @@ export default {
       this.pageData.resourceId = scheduleData.resourceId;
       this.pageData.workcenterno = scheduleData.workcenterno;
       this.pageData.currentDate = this.dayjs().format("YYYY-MM-DD HH:mm:ss")
+      this.currentDate = this.dayjs().format("YYYY-MM-DD  HH:mm:ss")
       this.scheduleDateShiftDto.resourceId = scheduleData.resourceId
       this.scheduleDateShiftDto.currentDateTime = this.dayjs().format("YYYY-MM-DD HH:mm:ss")
 
@@ -209,25 +210,28 @@ export default {
     /*关闭modal*/
     closeDialog(){
       this.$emit('update:visible', false);
+      this.currentDate = ''
+      this.shift = ''
+      this.pageData.newRollNo = ''
     },
 
     switchRollBun() {
       //人员判断
       if (this.pageData.operatorId == '' || this.pageData.operatorId == null) {
-        this.$message.error('请先切换人员!');
+        this.$message.warning('请先切换人员!');
         return false;
       }
       //首先判断数值是否通过判断
       let newRollNo = this.pageData.newRollNo;
       if (newRollNo == null || newRollNo == '') {
-        this.$message.error('请输入产品卷号!');
+        this.$message.warning('请输入产品卷号!');
         return false;
       }
       //校验是否继续
       switchrollRepackCheck(this.pageData).then(({data}) => {
         //判断是否成功
         if (data.code == 400) {
-          this.$message.error(data.msg);
+          this.$message.warning(data.msg);
         } else if (data.code == 500){
           this.$message.error(data.msg);
         } else if (data.resultMap.resultCode == '201') {