【修改】bug

src/main.js

@@ -1,14 +1,14 @@
 import Vue from 'vue'
-
+// import {hiPrintPlugin} from 'vue-plugin-hiprint'
+// hiPrintPlugin.disAutoConnect();
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 // import './plugins/jquery.hiwprint.js'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 // import locale from 'element-ui/lib/locale/lang/en' // lang i18n
-import print from '@/utils/print'
+
 import * as echarts from 'echarts'
 Vue.prototype.$echarts = echarts
-Vue.use(print)
 import '@/styles/index.scss' // global css
 
 import App from './App'
@@ -58,7 +58,7 @@ if (process.env.NODE_ENV === 'production') {
 // Vue.use(ElementUI, { locale })
 // 如果想要中文版 element-ui，按如下方式声明
 Vue.use(ElementUI)
-
+// Vue.use(hiPrintPlugin)
 // register global utility filters
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])

src/views/finance/receipt_list.vue

@@ -196,7 +196,7 @@
         </div>
       </div>
     </div>
-    
+
     <ReceiptPrint :listItem="queryItem" v-else-if="showDetail == 2" @backListFormDetail="backList" />
     <ReceiptListDetail :detailId="detailId" v-else />
     <!-- <print-preview ref="preView" /> -->
@@ -205,7 +205,7 @@
 </template>
 
 <script>
-  
+
 // import panel from './components/design/panel'
 // import { getDetail, detailArr } from './components/design/print-data'
 // import printPreview from './components/design/preview.vue'
@@ -259,8 +259,8 @@ export default {
     this.getCustomerDataList();
   },
   mounted() {
-    console.log(this.hiPrintPlugin,'888');
-    this.hiPrintPlugin.init()
+    console.log(this.$app,'888');
+    // this.hiPrintPlugin.init()
     var hiprintTemplate = new this.hiPrintPlugin.PrintTemplate();
       var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 });
   },
@@ -273,8 +273,6 @@ export default {
       });
       this.customerList = res.data.records;
     },
-  
-
     //合计
     getSummaries(param) {
       const { columns, data } = param;
@@ -372,7 +370,7 @@ export default {
 
     // 点击打印
     toPrint(row, type) {
-    
+
       panel.addPrintText({ options: { width: 140, height: 15, top: 20, left: 20, title: 'hiprint插件手动添加text', textAlign: 'center' } });
       // this.tableSelection = this.$refs.table.selection;
       if (!type) {

src/views/supply/engin/components/home_detail.vue

@@ -232,7 +232,7 @@
       <div class="page-footer">
         <div class="footer">
           <el-button type="success" @click="toCheckOrder">联查单据</el-button>
-          <el-button type="danger" @click="closeData" v-if=" !isDealer && (detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT')">关闭订单</el-button>
+          <el-button type="danger" @click="closeData" v-if=" (detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT')">关闭订单</el-button>
           <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button>
           <el-button type="primary" @click="overData" v-if="!isDealer">直调完结</el-button>
           <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.directTransferStatus" v-if="!isDealer">直调发货</el-button>

src/views/supply/engin/components/home_examine.vue

@@ -322,7 +322,7 @@
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm(1)" :loading="formLoading">审批通过</el-button>
         <el-button type="warning" @click="clickSubmitForm(0)" :loading="formLoading">审批驳回</el-button>
-        <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
+        <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;" v-if=" !isDealer">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>

src/views/supply/engin/components/home_form.vue

@@ -134,7 +134,7 @@
         </el-col>
         <el-col :xs="24" :sm="8" :lg="8">
           <el-form-item label="保证函" prop="refPromiseProvide">
-            <el-select v-model="mainForm.refPromiseProvide" placeholder="选择保证函状态" size="small" clearable style="width: 100%">
+            <el-select v-model="mainForm.refPromiseProvide" placeholder="选择保证函状态" :disabled=" (listItem && isDealer)?true:false" size="small" clearable style="width: 100%">
               <el-option label="未保证" value="未保证"></el-option>
               <el-option label="已保证" value="已保证"></el-option>
             </el-select>
@@ -318,7 +318,7 @@
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm(1)" :loading="formLoading">保 存</el-button>
         <el-button type="primary" @click="clickSubmitForm(2)" :loading="formLoading">提交审核</el-button>
-        <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
+        <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;" v-if=" !isDealer">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>
@@ -1141,7 +1141,7 @@ export default {
               return;
             }
             }
-           
+
           }
 
           let goodsList = JSON.parse(JSON.stringify(this.goodsList));

src/views/supply/engin/home_list.vue

@@ -121,7 +121,7 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="保证函" prop="refPromiseProvide">
-                <el-select v-model="screenForm.refPromiseProvide" :disabled="isCustomer?true:false" placeholder="保证函" filterable style="width: 100%">
+                <el-select v-model="screenForm.refPromiseProvide"  placeholder="保证函" filterable style="width: 100%">
                   <el-option label="全部" value=""></el-option>
                   <el-option label="未保证" value="未保证"></el-option>
                   <el-option label="已保证" value="已保证"></el-option>