no message

8f4b3132 · youjie · 6e26b2f2 · 8f4b3132 · 8f4b3132 · 8f4b3132
Commit 8f4b3132 authored Apr 11, 2023 by youjie
10 changed files
--- a/src/components/FinancialModule/editCapitalAllocationDetail.vue
+++ b/src/components/FinancialModule/editCapitalAllocationDetail.vue
@@ -133,7 +133,6 @@
    
 </template>
 <script>
-  import regexUtils from "../../assets/utils/regexUtils"; //引入正则验证
 export default {
   props:['isEditRate','id'],
  data(){

--- a/src/components/Hotel/reservation/OrderList.vue
+++ b/src/components/Hotel/reservation/OrderList.vue
@@ -480,8 +480,14 @@
              <span class="fz15 fbold">{{ item.HandFittingFee ? item.HandFittingFee : "-" }}</span>
            </template>
          </el-table-column>
-          <template slot="append" v-if="item.Remark||item.isMore">
-            <div style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}</div>
+          <template slot="append" v-if="(item.Remark||item.OPRemark||item.isMore)||(item.OrderStatus>1&&item.OrderStatus!=3)">
+            <div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.Remark" style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}
+              <i v-if="pagesTitle=='销售'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i></div>
+            <div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.OPRemark" style="padding:10px;color:#f1416c"
+            :style="{'padding':!item.Remark&&item.isMore?'0 10px 30px 10px':'0 10px 10px 10px'}">
+              OP备注：{{item.OPRemark}}
+              <i v-if="pagesTitle=='OP'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
+            </div>
            <more v-if="item.isMore" @change="ViewMore(item,index)" :upIcon="item.upIcon"></more>
          </template>
        </el-table>
@@ -509,20 +515,20 @@
            <span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
          </template>
        </el-table-column>
-        <el-table-column label="手配费应收" min-width="100">
+        <!-- <el-table-column label="手配费应收" min-width="100">
          <template slot-scope="scope">
            <span class="fz15 fbold">{{
              scope.row.HandFittingIncome ? scope.row.HandFittingIncome : "-"
            }}</span>
          </template>
-        </el-table-column>
-        <el-table-column label="手配费平台税金" min-width="100">
+        </el-table-column> -->
+        <!-- <el-table-column label="手配费平台税金" min-width="100">
          <template slot-scope="scope">
            <span class="fz15 fbold">{{
              scope.row.HandFittingTax ? scope.row.HandFittingTax : "-"
            }}</span>
          </template>
-        </el-table-column>
+        </el-table-column> -->
        <el-table-column label="毛利" min-width="100">
          <template slot-scope="scope">
            <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
@@ -606,7 +612,7 @@
            ></i>
          </el-tooltip>
        </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px">
          <div class="fz12">退款单据</div>
          <div class="row wrap orderNo fz12 py">
            <span
@@ -634,7 +640,7 @@
            ></i>
          </el-tooltip>
        </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px">
          <div class="fz12">成本单据</div>
          <div class="row wrap orderNo fz12 py">
            <span
@@ -661,7 +667,7 @@
            </el-tooltip>
          </div>
        </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
+        <!--<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px">
          <div class="fz12">手配费单据</div>
          <div class="row wrap orderNo fz12 py">
            <span
@@ -691,7 +697,7 @@
              @click="makeAdocument(item, index, 1, 'Hand')"
            ></i>
          </el-tooltip>
-        </div>
+        </div>-->
        <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
          <div class="row-c justify-sb borderD pb5">
            <span class="fz12 c9e">订单总金额</span>
@@ -868,6 +874,22 @@
          <button type="button" class="normalBtn" @click="saveVisa(item)">{{$t('pub.saveBtn')}}</button>
        </div>
      </div> -->
+      <!-- op备注 -->
+      <el-dialog custom-class='addCompany' :title="pagesTitle=='销售'?'编辑客户备注':'编辑OP备注'" :visible.sync="isShowRemark" center width="400px">
+        <el-row class="flex" style="margin-top: 10px;">
+          <el-col>
+            <span style="display: block;margin-bottom: 10px;">备注：</span>
+            <span>
+              <el-input type="textarea" :rows="4" v-model="postMsg.Remark">
+              </el-input>
+            </span>
+          </el-col>
+        </el-row>
+        <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="isShowRemark = false">取消</button> &nbsp;
+          <button class="normalBtn" type="primary" @click="submitEditRemark">{{$t('pub.sureBtn')}}</button>
+        </div>
+      </el-dialog>
    <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
  </div>
 </template>
@@ -879,6 +901,8 @@ export default {
  props: ["OrderList","pagesTitle"],
  data() {
    return {
+      postMsg:{OrderId:0,Type:1,Remark:''},
+      isShowRemark: false,
      queryObj:null,
      cdState: false,
      copyId: 0,
@@ -935,6 +959,30 @@ export default {
      },100)
      
    },
+    editRemark(item){
+      this.postMsg.OrderId = item.OrderId
+      this.postMsg.Remark = this.pagesTitle=='销售'?item.Remark:item.OPRemark
+      this.isShowRemark = true
+    },
+    submitEditRemark(){
+      if(!this.postMsg.Remark){
+        this.$message.error('OP备注不能为空');
+        return
+      }
+        this.apipost('ticket_post_SetCustomerOrderRemark', {
+          OrderId: this.postMsg.OrderId,
+          Type: this.pagesTitle=='销售'?1:2,
+          Remark: this.postMsg.Remark
+        }, res => {
+          if (res.data.resultCode == 1) {
+              this.isShowRemark = false
+              this.$emit('success')
+              this.$forceUpdate();
+          } else {
+            this.Error(res.data.message);
+          }
+        })
+    },
    ViewMore(x,index){
        x.upIcon = !x.upIcon
        if(x.upIcon){
@@ -991,7 +1039,8 @@ export default {
    // 单据详情
    openDetails(item) {
      let query = {
-        id: item.FrID
+        id: item.FrID,
+        blank: "y",
      };
      this.$router.push({
        path: "/FinancialDocumentsDetail",
@@ -1024,7 +1073,7 @@ export default {
        blank: "y",
        tab: `新增${text}单据`,
        Type: type,
-        tradeObj: JSON.stringify(this.BillMakingMsg)
+        tradeObj: JSON.stringify(this.BillMakingMsg),
      };
      this.queryObj = query
      if(!Offset){

--- a/src/components/Hotel/singleProduct/components/OrderList.vue
+++ b/src/components/Hotel/singleProduct/components/OrderList.vue
@@ -588,7 +588,7 @@
            ></i>
          </el-tooltip>
        </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px">
          <div class="fz12">退款单据</div>
          <div class="row wrap orderNo fz12 py c3FC4FF">
            <span
@@ -614,7 +614,7 @@
            ></i>
          </el-tooltip>
        </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px">
          <div class="fz12">成本单据</div>
          <div class="row wrap orderNo fz12 py c3FC4FF">
            <span
@@ -639,7 +639,7 @@
            </el-tooltip>
          </div>
        </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px">
          <div class="fz12">手配费单据</div>
          <div class="row wrap orderNo fz12 py c3FC4FF">
            <span
@@ -899,7 +899,8 @@ export default {
    // 单据详情
    openDetails(item) {
      let query = {
-        id: item.FrID
+        id: item.FrID,
+        blank: "y",
      };
      this.$router.push({
        path: "/FinancialDocumentsDetail",

--- a/src/components/SalesVisa/VisaProductOrder.vue
+++ b/src/components/SalesVisa/VisaProductOrder.vue
@@ -992,7 +992,7 @@
              <div class="row justify-sb wrap mr">
                <div class="row relative" style="margin-top: 5px;">
                  <span>收款单据：</span>
-                  <span class="cursor-pointer radius5 mr px5" 
+                  <span class="cursor-pointer radius5 mr mb px5" 
                    :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
                    'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.FinanceList"
                      @click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
@@ -1009,7 +1009,7 @@
                </div>
                <div class="row relative" style="margin-top: 5px;">
                  <span>退款单据：</span>
-                  <span class="cursor-pointer radius5 mr px5" 
+                  <span class="cursor-pointer radius5 mr mb px5" 
                    :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
                    'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundFinanceList"
                      @click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
@@ -1026,7 +1026,7 @@
                </div>
                <div class="row relative" style="margin-top: 5px;">
                  <span>成本单据：</span>
-                  <span class="cursor-pointer radius5 mr px5" 
+                  <span class="cursor-pointer radius5 mr mb px5" 
                    :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
                    'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostFinanceList"
                      @click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>

--- a/src/components/SalesVisa/components/visaOrderList.vue
+++ b/src/components/SalesVisa/components/visaOrderList.vue
@@ -634,7 +634,7 @@
                  <div class="row-c">
                  <div class="fz12 flex-s">收款单据</div>
                  <div class="row wrap orderNo fz12 ml">
-                    <span class="cursor-pointer radius5 mr px5" style="margin: 3px;"
+                    <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
                    :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
                    'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in item.financeList"
                      @click="openDetails(x)">{{ x.frID }}</span>
@@ -652,7 +652,7 @@
                  <div class="row-c">
                  <div class="fz12 flex-s">退款单据</div>
                  <div class="row wrap orderNo fz12 ml">
-                    <span class="cursor-pointer radius5 mr px5" style="margin: 3px;"
+                    <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
                    :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
                    'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in item.refundFinanceList"
                      @click="openDetails(x)">{{ x.frID }}</span>
@@ -670,7 +670,7 @@
                  <div class="row-c">
                  <div class="fz12 flex-s">成本单据</div>
                  <div class="row wrap orderNo fz12 ml">
-                    <span class="cursor-pointer radius5 mr px5" style="margin: 3px;"
+                    <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
                    :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
                    'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in item.costFinanceList"
                      @click="openDetails(x)">{{ x.frID }}</span>
@@ -1284,7 +1284,8 @@ export default {
    // 单据详情
    openDetails(item) {
      let query = {
-        id: item.frID
+        id: item.frID,
+        blank: "y",
      };
      this.$router.push({
        path: "/FinancialDocumentsDetail",

--- a/src/components/SingleAirTicket/components/OrderList.vue
+++ b/src/components/SingleAirTicket/components/OrderList.vue
@@ -1115,7 +1115,8 @@
        // 单据详情
        openDetails(item) {
          let query = {
-            id: item.FrID
+            id: item.FrID,
+            blank: "y",
          };
          this.$router.push({
            path: "/FinancialDocumentsDetail",

--- a/src/components/busManagement/BookAcar/components/orderList.vue
+++ b/src/components/busManagement/BookAcar/components/orderList.vue
@@ -539,8 +539,14 @@
                    <span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
                  </template>
                </el-table-column>
-                <template slot="append" v-if="item.Remark">
-                  <div style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}</div>
+                <template slot="append" v-if="(item.Remark||item.OPRemark||item.isMore)||(item.OrderStatus>1&&item.OrderStatus!=3)">
+                  <div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.Remark" style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}
+                    <i v-if="pagesTitle=='销售'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i></div>
+                  <div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.OPRemark" style="padding:10px;color:#f1416c"
+                  :style="{'padding':!item.Remark&&item.isMore?'0 10px 30px 10px':'0 10px 10px 10px'}">
+                    OP备注：{{item.OPRemark}}
+                    <i v-if="pagesTitle=='OP'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
+                  </div>
                </template>
            </el-table>
          </div>
@@ -799,6 +805,22 @@
            </el-row>
          </div>
        </el-dialog>
+        <!-- op备注 -->
+        <el-dialog custom-class='addCompany' :title="pagesTitle=='销售'?'编辑客户备注':'编辑OP备注'" :visible.sync="isShowRemark" center width="400px">
+          <el-row class="flex" style="margin-top: 10px;">
+            <el-col>
+              <span style="display: block;margin-bottom: 10px;">备注：</span>
+              <span>
+                <el-input type="textarea" :rows="4" v-model="postMsg.Remark">
+                </el-input>
+              </span>
+            </el-col>
+          </el-row>
+          <div slot="footer" class="dialog-footer">
+            <button class="hollowFixedBtn" @click="isShowRemark = false">取消</button> &nbsp;
+            <button class="normalBtn" type="primary" @click="submitEditRemark">{{$t('pub.sureBtn')}}</button>
+          </div>
+        </el-dialog>
        <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
      </div>
    </template>
@@ -809,6 +831,8 @@
      props: ["OrderList","pagesTitle"],
      data() {
        return {
+          postMsg:{OrderId:0,Type:1,Remark:''},
+          isShowRemark: false,
          queryObj:null,
          cdState: false,
          copyId: 0,
@@ -932,6 +956,30 @@
            this.cdState = true
          },100)
        },
+        editRemark(item){
+          this.postMsg.OrderId = item.OrderId
+          this.postMsg.Remark = this.pagesTitle=='销售'?item.Remark:item.OPRemark
+          this.isShowRemark = true
+        },
+        submitEditRemark(){
+          if(!this.postMsg.Remark){
+            this.$message.error('OP备注不能为空');
+            return
+          }
+          this.apipost('CarSingle_post_SetCarOrderRemark', {
+            OrderId: this.postMsg.OrderId,
+            Type: this.pagesTitle=='销售'?1:2,
+            Remark: this.postMsg.Remark
+          }, res => {
+              if (res.data.resultCode == 1) {
+                  this.isShowRemark = false
+                  this.$emit('success')
+                  this.$forceUpdate();
+              } else {
+                this.Error(res.data.message);
+              }
+            })
+        },
        submit2(){
          if(this.loading3) return
          this.$refs['msgParameter'].validate((valid) => {
@@ -1021,7 +1069,8 @@
        // 单据详情
        openDetails(item) {
          let query = {
-            id: item.FrID
+            id: item.FrID,
+            blank: "y",
          };
          this.$router.push({
            path: "/FinancialDocumentsDetail",

--- a/src/components/busManagement/BookAcar/components/tripBusOrderList.vue
+++ b/src/components/busManagement/BookAcar/components/tripBusOrderList.vue
@@ -502,12 +502,12 @@
                    <span class="fz15 fbold">{{ item.ShouPeiFee }}</span>
                  </template>
                </el-table-column>
-                <template slot="append" v-if="item.CreateRemark||item.Remark">
+                <template slot="append">
                  <div v-if="item.CreateRemark" style="padding:10px;color:#f1416c">客户备注：{{item.CreateRemark}}</div>
-                  <div v-if="item.Remark" style="padding:10px;color:#f1416c"
+                  <div v-if="item.Remark||pagesTitle=='OP'" style="padding:10px;color:#f1416c"
                  :style="{'padding':!item.CreateRemark?'10px':'0 10px 10px 10px'}">
-                    <template v-if="(item.Remark||item.OfferState!=3)&&pagesTitle!='销售'">OP备注：{{item.Remark}}</template>
-                    <i v-if="item.OfferState!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
+                    OP备注：{{item.Remark}}
+                    <i v-if="item.OfferState!=1&&item.OfferState!=3&&pagesTitle=='OP'" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
                  </div>
                </template>
            </el-table>
@@ -1086,13 +1086,6 @@
        };
      },
      watch: {
-        postMsg:{
-          handler(newValue, oldValue) {
-            
-          },
-          deep: true,
-          immediate: false
-        },
        pagesTitle(val,oldval){
          this.Title = val
        },
@@ -1186,7 +1179,8 @@
        // 单据详情
        openDetails(item) {
          let query = {
-            id: item.FrID
+            id: item.FrID,
+            blank: "y",
          };
          this.$router.push({
            path: "/FinancialDocumentsDetail",

--- a/src/components/scenicSpot/reservation/OrderList.vue
+++ b/src/components/scenicSpot/reservation/OrderList.vue
@@ -580,8 +580,14 @@
              <span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
            </template>
          </el-table-column>
-          <template slot="append" v-if="item.Remark">
-            <div style="padding:10px;color:#f1416c">客户备注：{{ item.Remark }}</div>
+          <template slot="append" v-if="(item.Remark||item.OPRemark||item.isMore)||(item.OrderStatus>1&&item.OrderStatus!=3)">
+            <div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.Remark" style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}
+              <i v-if="pagesTitle=='销售'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i></div>
+            <div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.OPRemark" style="padding:10px;color:#f1416c"
+            :style="{'padding':!item.Remark&&item.isMore?'0 10px 30px 10px':'0 10px 10px 10px'}">
+              OP备注：{{item.OPRemark}}
+              <i v-if="pagesTitle=='OP'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
+            </div>
          </template>
        </el-table>
      </div>
@@ -682,10 +688,10 @@
            </template>
          </div>
        </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px">
          <div class="fz12">收款单据</div>
          <div class="row wrap orderNo fz12 py">
-            <span class="cursor-pointer radius5 mr px5" 
+            <span class="cursor-pointer radius5 mr mb px5" 
            :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.IncomeList"
              @click="openDetails(x)">{{ x.FrID }}</span>
@@ -698,10 +704,10 @@
              @click="makeAdocument(item, index, 1)"></i>
          </el-tooltip>
        </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px">
          <div class="fz12">退款单据</div>
          <div class="row wrap orderNo fz12 py">
-            <span class="cursor-pointer radius5 mr px5" 
+            <span class="cursor-pointer radius5 mr mb px5" 
            :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundList"
              @click="openDetails(x)">{{ x.FrID }}</span>
@@ -714,10 +720,10 @@
              @click="makeAdocument(item, index, 2)"></i>
          </el-tooltip>
        </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px">
          <div class="fz12">成本单据</div>
          <div class="row wrap orderNo fz12 py">
-            <span class="cursor-pointer radius5 mr px5" 
+            <span class="cursor-pointer radius5 mr mb px5" 
            :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostList"
              @click="openDetails(x)">{{ x.FrID }}</span>
@@ -950,6 +956,22 @@
        </el-row>
      </div>
    </el-dialog>
+    <!-- op备注 -->
+    <el-dialog custom-class='addCompany' :title="pagesTitle=='销售'?'编辑客户备注':'编辑OP备注'" :visible.sync="isShowRemark" center width="400px">
+      <el-row class="flex" style="margin-top: 10px;">
+        <el-col>
+          <span style="display: block;margin-bottom: 10px;">备注：</span>
+          <span>
+            <el-input type="textarea" :rows="4" v-model="postMsg.Remark">
+            </el-input>
+          </span>
+        </el-col>
+      </el-row>
+      <div slot="footer" class="dialog-footer">
+        <button class="hollowFixedBtn" @click="isShowRemark = false">取消</button> &nbsp;
+        <button class="normalBtn" type="primary" @click="submitEditRemark">{{$t('pub.sureBtn')}}</button>
+      </div>
+    </el-dialog>
    <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
  </div>
 </template>
@@ -962,6 +984,8 @@ export default {
  props: ["OrderList", "pagesTitle"],
  data() {
    return {
+      postMsg:{OrderId:0,Type:1,Remark:''},
+      isShowRemark: false,
      queryObj:null,
      cdState: false,
      copyId: 0,
@@ -1071,7 +1095,7 @@ export default {
  },
  watch: {
    pagesTitle(val, oldval) {
-
+      this.pagesTitle = val
    },
    OrderList: {
      handler(val, oldVal) {
@@ -1087,6 +1111,30 @@ export default {
      },100)
      
    },
+    editRemark(item){
+      this.postMsg.OrderId = item.OrderId
+      this.postMsg.Remark = this.pagesTitle=='销售'?item.Remark:item.OPRemark
+      this.isShowRemark = true
+    },
+    submitEditRemark(){
+      if(!this.postMsg.Remark){
+        this.$message.error('OP备注不能为空');
+        return
+      }
+        this.apipost('ticket_post_SetTicketOrderRemark', {
+          OrderId: this.postMsg.OrderId,
+          Type: this.pagesTitle=='销售'?1:2,
+          Remark: this.postMsg.Remark
+        }, res => {
+          if (res.data.resultCode == 1) {
+              this.isShowRemark = false
+              this.$emit('success')
+              this.$forceUpdate();
+          } else {
+            this.Error(res.data.message);
+          }
+        })
+    },
    submit2() {
      if (this.loading3) return
      this.$refs['msgParameter'].validate((valid) => {
@@ -1176,7 +1224,8 @@ export default {
    // 单据详情
    openDetails(item) {
      let query = {
-        id: item.FrID
+        id: item.FrID,
+        blank: "y",
      };
      this.$router.push({
        path: "/FinancialDocumentsDetail",

--- a/src/router/config.js
+++ b/src/router/config.js
@@ -1696,7 +1696,7 @@ export default {
            {
              path: '/SingleticketOrderListOP', //单项门票预定列表OP
              name: 'SingleticketOrderListOP',
-              component: resolve => require(['@/components/scenicSpot/reservation/ReservationOrder'], resolve),
+              component: resolve => require(['@/components/scenicSpot/Singleticket/SingleticketOrderListOP'], resolve),
              meta: {
                title: '门票预定订单'
              },