Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue

@@ -119,12 +119,12 @@ export default {
     reset() {
       this.form = {
         id: this.id,
-        status: "2",
+        // status: "2",
         probId: null,
         billCode: null,
         title: null,
         content: null,
-        dealResult: null,
+        dealResult: "1",
         showFlag: null,
         replayId: null,
         delFlag: null,
@@ -154,7 +154,7 @@ export default {
             billCode: this.promInfo.billCode,
             title: this.promInfo.problemTitle,
             content: this.form.content,//具体内容
-            status: this.form.status,//状态
+            // status: this.form.status,//状态
             dealResult: this.form.dealResult,//状态
             replayId: this.$store.getters.empCode,//针对的回复的ID
             createBy: this.$store.getters.empName,
@@ -169,6 +169,7 @@ export default {
           }else{
             this.$message.error(response & response.msg || "未知错误")
           }
+          this.form.content = "";
         }
       });
     },

src/views/emis/emisWaybillProblemFaq/commentPanel.vue

@@ -4,7 +4,8 @@
           <div class="author-info">
               <span class="author-name">
                 {{ item.createByName }}
-                <span class="author-status" v-if="item.status=='2'">{{ $t('[处理完毕]') }}</span>
+                <span class="author-status1" v-if="item.dealResult=='1'">{{ $t('[处理中]') }}</span>
+                <span class="author-status" v-if="item.dealResult=='2'">{{ $t('[处理完毕]') }}</span>
                 <span class="author-time">{{ item.createTime }}</span>
               </span>
           </div>
@@ -158,7 +159,23 @@ padding: 10px;
     font-weight: bold;
     // margin-right: 10px;
   }
-  .author-status {
+  .author-status0 {
+    color: #000;
+    font-size: 13px;
+    font-weight: normal;
+    background-color: rgb(220, 220, 220);
+    margin-left: 10px;
+    margin-right: 10px;
+  }
+  .author-status1 {
+    color: #000;
+    font-size: 13px;
+    font-weight: normal;
+    background-color: #bdd2ff;
+    margin-left: 10px;
+    margin-right: 10px;
+  }
+  .author-status2 {
     color: #000;
     font-size: 13px;
     font-weight: normal;

src/views/emis/emisWaybillProblemInfo/problemEntry.vue

@@ -23,11 +23,11 @@
             <el-col :span="8">
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('通知网点')" prop="notifySite" label-width="80px">
-                <!-- <EmisSiteSimplePicker v-model="form.notifySite"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker> -->
-                <el-select v-model="form.notifySiteCode" @change="onScanSiteSelect">
+              <el-form-item :label="$t('通知网点')" prop="notifySiteCode" label-width="80px">
+                <EmisSiteSimplePicker v-model="form.notifySiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
+                <!-- <el-select v-model="form.notifySiteCode" @change="onScanSiteSelect">
                   <el-option v-for="item in notifySiteDataSource" :key="item.notifySiteCode" :value="item.notifySiteCode" :label="item.notifySiteName"  ></el-option>
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
 
@@ -296,18 +296,20 @@ export default {
       this.multiple = !selection.length
     },
     onScanSiteSelect(item){
+      debugger
       if(!item){
         this.form.notifySiteCode = null;
         this.form.notifySiteName = null;
         return;
       }
-      // this.form.notifySiteCode=item.notifySiteCode;
-      this.notifySiteDataSource.forEach(nItem => {
-        if(nItem.notifySiteCode == item){
-          this.form.notifySiteName=nItem.notifySiteName;
-          return;
-        }
-      })
+      this.form.notifySiteCode=item.siteCode;
+      this.form.notifySiteName=item.siteName;
+      // this.notifySiteDataSource.forEach(nItem => {
+      //   if(nItem.notifySiteCode == item){
+      //     this.form.notifySiteName=nItem.notifySiteName;
+      //     return;
+      //   }
+      // })
     },
     onproblemTypeSelect(item){
       // debugger;
@@ -402,8 +404,11 @@ export default {
       else{
         this.form.notifySiteCode = this.tempRecord.sendSiteCode;
         this.form.notifySiteName = this.tempRecord.sendSiteName;
+        console.log(this.form.notifySiteCode)
       }
 
+      this.form = {...this.form};
+
       // listEmisWaybill({billCode:this.form.billCode}).then(response => {
       //   this.loading = false;
       //   let scanDate = new Date();

src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue

@@ -390,6 +390,7 @@ export default {
         return '';
         },
     getCurrentRow(val) {
+      debugger;
       this.selData = val;
       // 显示内容
 
@@ -406,6 +407,7 @@ export default {
     /** 查询扫描记录列表 */
     getList() {
       this.loading = true;
+      this.radio='';
       console.log("---->this.queryParams,", this.queryParams);
       if (null != this.dateTimeRange && '' != this.dateTimeRange) {
         this.queryParams.params.beginRegisterDate =dateToStr(new Date(this.dateTimeRange[0]));