Ver código fonte

Merge branch 'develop_yh21' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh21

chenrui 1 ano atrás
pai
commit
2915035160

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.35",
+    "version": "2.2.36",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 13 - 7
src/views/salesManagement/sendOutOrder/detailModal.vue

@@ -60,14 +60,14 @@
           </div>
           <div style="flex-basis:60%;display:flex;" v-if="detail.receiveFlag == 1 && type!=0">
             问题反馈:
-            <div style="padding:0 10px;">
+            <div style="padding:0 10px;max-width: 60%;">
               <div v-if="showEditQus" style="width:400px;">
-                <a-textarea @blur="saveIssue" allowClear v-model="detail.issueRemark" placeholder="请输入问题反馈(最多100字符)" :maxLength="100" auto-size />
+                <a-textarea ref="issue" @blur="saveIssue" allowClear v-model="detail.issueRemark" placeholder="请输入问题反馈(最多100字符)" :maxLength="100" auto-size />
               </div>
-              <div v-else>{{ detail.issueRemark||'--' }}</div>
+              <div style="word-break: break-all;" v-else>{{ detail.issueRemark||'--' }}</div>
             </div>
             <div v-if="!showEditQus">
-              <a-icon @click="showEditQus = !showEditQus" style="color:#00aaff;font-size:16px;cursor:pointer;" type="form" />
+              <a-icon @click="editIssue" style="color:#00aaff;font-size:16px;cursor:pointer;" type="form" />
             </div>
           </div>
         </div>
@@ -175,11 +175,17 @@ export default {
         this.showTipModal = false
       }
     },
+    editIssue(){
+      this.showEditQus = !this.showEditQus
+      this.$nextTick(()=>{
+        this.$refs.issue.focus()
+      })
+    },
     saveIssue(){
       updateIssueRemark({issueRemark: this.detail.issueRemark, sendBillSn: this.sendBillSn}).then(res => {
-        if(res.status == 200){
-          this.showEditQus = false
-        }
+        this.showEditQus = false
+      }).catch(res => {
+        this.$refs.issue.focus()
       })
     },
     // 编辑