Commit 4905f05c authored by zhengke's avatar zhengke

修改

parent e411b7b6
...@@ -509,7 +509,7 @@ ...@@ -509,7 +509,7 @@
<continueclass-form v-if="isShowContinueClass" :save-obj="orderObj" @close="closeContinueClassForm" <continueclass-form v-if="isShowContinueClass" :save-obj="orderObj" @close="closeContinueClassForm"
@success="refreshClassOrder"></continueclass-form> @success="refreshClassOrder"></continueclass-form>
<!-- 查看报价单 --> <!-- 查看报价单 -->
<viewquotation-form v-if="isShowviewQuo" :rId="rId" @close="closeQuota" @success="refreshView"> <viewquotation-form v-if="isShowviewQuo" :rId="rId" :isShowCancle="1" @close="closeQuota" @success="refreshView">
</viewquotation-form> </viewquotation-form>
</div> </div>
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<q-btn color="primary" flat label="获取二维码"></q-btn> <q-btn color="primary" flat label="获取二维码"></q-btn>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<q-btn v-if="model&&model.CustomerStatus&&(model.CustomerStatus==1||model.CustomerStatus==2)" <q-btn v-if="model&&model.CustomerStatus&&(model.CustomerStatus==1||model.CustomerStatus==2)&&ShowCancle==0"
color="dark" label="撤销报价单" @click="setOfferStatus"></q-btn> color="dark" label="撤销报价单" @click="setOfferStatus"></q-btn>
</div> </div>
</div> </div>
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
import print from "print-js"; import print from "print-js";
import html2canvas from "html2canvas"; import html2canvas from "html2canvas";
export default { export default {
props: ["rId"], props: ["rId","isShowCancle"],
data() { data() {
return { return {
persistent: true, persistent: true,
...@@ -167,6 +167,7 @@ ...@@ -167,6 +167,7 @@
isGengernal: false, isGengernal: false,
Id: 0, //报价单编号 Id: 0, //报价单编号
model: {}, //报价单详情 model: {}, //报价单详情
ShowCancle:0 //0显示 1 不显示
}; };
}, },
created() { created() {
...@@ -174,6 +175,9 @@ ...@@ -174,6 +175,9 @@
this.Id = this.rId; this.Id = this.rId;
this.getDetails(); this.getDetails();
} }
if(this.isShowCancle){
this.ShowCancle = this.isShowCancle;
}
}, },
methods: { methods: {
//设置报价单状态 //设置报价单状态
......
...@@ -1339,7 +1339,7 @@ ...@@ -1339,7 +1339,7 @@
</viewer> </viewer>
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass"></classinfo-form> <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass"></classinfo-form>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a> <a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
<viewquotationForm v-if="isShowviewQuo" :rId="rId" @close="closeQuota"> <viewquotationForm v-if="isShowviewQuo" :rId="rId" :isShowCancle="1" @close="closeQuota">
</viewquotationForm> </viewquotationForm>
</div> </div>
......
...@@ -844,7 +844,7 @@ ...@@ -844,7 +844,7 @@
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a> <a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass"> <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass">
</classinfo-form> </classinfo-form>
<viewquotationForm v-if="isShowviewQuo" :rId="rId" @close="closeQuota"> <viewquotationForm v-if="isShowviewQuo" :rId="rId" :isShowCancle="1" @close="closeQuota">
</viewquotationForm> </viewquotationForm>
</div> </div>
</template> </template>
......
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
<edittransorder-form :obj="offerObj" @save="refreshPage()"></edittransorder-form> <edittransorder-form :obj="offerObj" @save="refreshPage()"></edittransorder-form>
</q-dialog> </q-dialog>
<!-- 查看报价单 --> <!-- 查看报价单 -->
<viewquotation-form v-if="isShowviewQuo" :rId="rId" @close="closeQuota"> <viewquotation-form v-if="isShowviewQuo" :rId="rId" :isShowCancle="1" @close="closeQuota">
</viewquotation-form> </viewquotation-form>
</div> </div>
......
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<edittransorder-form :obj="offerObj" @save="refreshPage()"></edittransorder-form> <edittransorder-form :obj="offerObj" @save="refreshPage()"></edittransorder-form>
</q-dialog> </q-dialog>
<!-- 查看报价单 --> <!-- 查看报价单 -->
<viewquotation-form v-if="isShowviewQuo" :rId="rId" @close="closeQuota"> <viewquotation-form v-if="isShowviewQuo" :rId="rId" :isShowCancle="0" @close="closeQuota">
</viewquotation-form> </viewquotation-form>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment