Merge branch 'master' of http://123.56.95.229:10010/r/高精

2020-04-28 18:34:19 +08:00
parent a69eb1ca0e c51b22f260
commit 8edf3ea21f
12 changed files with 42 additions and 49 deletions
--- a/src/components/AmountInputBox/AmountInputBox.js
+++ b/src/components/AmountInputBox/AmountInputBox.js
@@ -39,7 +39,12 @@ const checkFloat = (e, reg, charcode, el) => {
    }
  }
 }
-
+const loading = (e, el, bind) => {
+  el.disabled = true
+  setTimeout(function() {
+    el.disabled = false
+  }, 3000)
+}
 /**
 * @author LeeYunxiang
 * @description 限制数字输入格式 int => 正整数 , num => 自然数(正整数包括0) , float => 正数包括小数(建议用text类型的input表单)
@@ -75,6 +80,13 @@ export default {
            break
        }
      })
+      el.addEventListener('click', e => {
+        switch (bind.value) {
+          case 'loading':
+            loading(e, el, bind)
+            break
+        }
+      })
    }
  }
 }
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -42,7 +42,7 @@
      <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">保证金</el-button>
      <el-tooltip :open-delay="1200" effect="dark" content="导出" style="margin: 10px 0 0 590px;width: 50px" placement="top">
        <div style="display: inline-block">
-          <el-button type="primary" plain class="el-icon-download" size="small" style="" @click="exportExcel">导出</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="" @click="exportExcel">导出</el-button>
        </div>
      </el-tooltip>
    </el-card>
@@ -260,7 +260,7 @@
        </el-table>
      </div>
      <el-button size="small" style="margin-left: 90px" icon="el-icon-circle-close" @click="offName">取消</el-button>
-      <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getName">确认</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="getName">确认</el-button>
      <!--<el-button style="margin-left: 260px" @click="offName">取消</el-button>-->
      <!--<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>-->
    </el-dialog>
@@ -289,7 +289,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form1')">取消</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form1')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form1')">确 定</el-button>
        <!--<el-button @click="callOff('form1')">取消</el-button>-->
        <!--<el-button type="primary" @click="submit('form1')">确 定</el-button>-->
      </div>
@@ -377,7 +377,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form2')">取消</el-button>
-        <el-button :disabled="submitDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form2')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form2')">确 定</el-button>
      </div>
    </el-dialog>

@@ -400,7 +400,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOffTime('Timeform')">取消</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('Timeform')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('Timeform')">确 定</el-button>
      </div>
    </el-dialog>

@@ -454,7 +454,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondform('PerformanceBondform')">取消</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondform('PerformanceBondform')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondform('PerformanceBondform')">确 定</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -341,7 +341,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOff2('form')">取消</el-button>
-        <el-button :disabled="addCustomerDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit2('form2')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit2('form2')">确 定</el-button>
        <!--<el-button @click="callOff2()">取消</el-button>-->
        <!--<el-button type="primary" @click="submit2('form2')">确 定</el-button>-->
      </div>
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -24,7 +24,7 @@
          end-placeholder="结束日期"/>
        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
        <el-tooltip v-show="true" :open-delay="1000" effect="dark" content="导出合同执行情况" placement="top">
-          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 300px" @click="exportExcel">导出</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 300px" @click="exportExcel">导出</el-button>
        </el-tooltip>
      </el-row>
    </el-card>
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -1,13 +1,6 @@
 <template>
  <div class="app-container">
    <el-card>
-      <!--<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px 10px;width: 180px " size="small" clearable>-->
-      <!--<el-option-->
-      <!--v-for="item in entryName"-->
-      <!--:key="item.value"-->
-      <!--:label="item.label"-->
-      <!--:value="item.value"/>-->
-      <!--</el-select>-->
      <el-input v-model="customerName" clearable size="small" style="width:220px;" placeholder="客户名称/项目名称/合同编号"/>
      <el-select v-show="false" v-model="customerName" filterable placeholder="请输入客户名称" style="margin: 3px;width: 220px " size="small" clearable>
        <el-option
@@ -32,12 +25,9 @@
      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
      <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
        <div style="display: inline-block">
-          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 250px" @click="exportExcel">导出</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 250px" @click="exportExcel">导出</el-button>
        </div>
      </el-tooltip>
-      <!--<el-badge :value="value" :max="99" class="item">-->
-      <!--<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>-->
-      <!--</el-badge>-->
    </el-card>
    <el-card>
      <el-col :span="17">
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -26,7 +26,7 @@
        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()" >查询</el-button>
        <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >合同</el-button>
        <el-tooltip v-show="true" :open-delay="1000" effect="dark" content="导出营销合同" placement="top">
-          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 410px" @click="exportExcel">导出</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 410px" @click="exportExcel">导出</el-button>
        </el-tooltip>
      </div>
    </el-card>
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -32,7 +32,7 @@
          @click.stop="openAddInvoiceRecordingDialog(); flag = 1">开票</el-button>
        <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
          <div style="display: inline-block">
-            <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 70px" @click="exportExcel">导出</el-button>
+            <el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 70px" @click="exportExcel">导出</el-button>
          </div>
        </el-tooltip>
      </el-row>
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -41,7 +41,7 @@
      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
      <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top" style="margin: 10px 0 0 630px">
        <div style="display: inline-block">
-          <el-button type="primary" plain class="el-icon-download" size="small" @click="exportExcel">导出</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" @click="exportExcel">导出</el-button>
        </div>
      </el-tooltip>
    </el-card>
@@ -297,7 +297,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOffTime('form')">取消</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('form')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('form')">确 定</el-button>
        <!--<el-button @click="callOffTime('form')">取消</el-button>-->
        <!--<el-button type="primary" @click="submitTime('form')">确 定</el-button>-->
      </div>
@@ -370,7 +370,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondDialog('form2')">取消</el-button>
-        <el-button :disabled="submitPerformanceBondDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
      </div>
    </el-dialog>
  </div>
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -42,7 +42,7 @@
      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSizeProject = 30;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
      <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top" style="margin: 10px 0 0 645px">
        <div style="display: inline-block">
-          <el-button type="primary" plain class="el-icon-download" size="small" @click="exportExcel">导出</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" @click="exportExcel">导出</el-button>
        </div>
      </el-tooltip>
    </el-card>
@@ -435,7 +435,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form')">取消</el-button>
-        <el-button :disabled="submit1Disabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form')">确 定</el-button>
        <!--<el-button @click="callOff('form')">取消</el-button>-->
        <!--<el-button type="primary" @click="submit1('form')">确 定</el-button>-->
      </div>
@@ -490,7 +490,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form2')">取消</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form2')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form2')">确 定</el-button>
      </div>
    </el-dialog>

@@ -538,7 +538,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form3')">取消</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form3')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form3')">确 定</el-button>
        <!--<el-button @click="callOff('form3')">取消</el-button>-->
        <!--<el-button type="primary" @click="submit1('form3')">确 定</el-button>-->
      </div>
@@ -569,7 +569,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form4')">取消</el-button>
-        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form4')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form4')">确 定</el-button>
        <!--<el-button @click="callOff('form4')">取消</el-button>-->
        <!--<el-button type="primary" @click="submit1('form4')">确 定</el-button>-->
      </div>
--- a/src/views/MarketingCenter/ShippingInquiries/index.vue
+++ b/src/views/MarketingCenter/ShippingInquiries/index.vue
@@ -19,7 +19,7 @@
      <el-button type="primary" icon="el-icon-search" size="mini" style="margin-left: 10px" plain @click="openSearch">查询</el-button>
      <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
        <div style="display: inline-block">
-          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
        </div>
      </el-tooltip>
    </el-card>
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -13,7 +13,7 @@
        <el-button type="distribution" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
      </el-tooltip>
      <el-tooltip :open-delay="1000" effect="dark" content="打印装箱单" placement="top">
-        <el-button type="primary" size="small" style="margin-left: 10px" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" size="small" style="margin-left: 10px" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
      </el-tooltip>
      <el-table
        v-loading="loading"
@@ -364,8 +364,8 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取消</el-button>
-        <el-button v-if="receiptTitle === '新增总装箱单'" type="primary" @click="submitAddReceipt">确定</el-button>
-        <el-button v-else-if="receiptTitle === '编辑总装箱单'" type="primary" @click="submitEditReceipt">确定</el-button>
+        <el-button v-positive="'loading'" v-if="receiptTitle === '新增总装箱单'" :disabled="false" type="primary" @click="submitAddReceipt">确定</el-button>
+        <el-button v-positive="'loading'" v-else-if="receiptTitle === '编辑总装箱单'" :disabled="false" type="primary" @click="submitEditReceipt">确定</el-button>
      </div>
    </el-dialog>

@@ -397,8 +397,8 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取消</el-button>
-        <el-button v-if="machineTitle==='添加主机'" type="primary" @click="submitAddMachine">确定</el-button>
-        <el-button v-else-if="machineTitle==='编辑主机'" type="primary" @click="submitEditMachine">确定</el-button>
+        <el-button v-positive="'loading'" v-if="machineTitle==='添加主机'" :disabled="false" type="primary" @click="submitAddMachine">确定</el-button>
+        <el-button v-positive="'loading'" v-else-if="machineTitle==='编辑主机'" :disabled="false" type="primary" @click="submitEditMachine">确定</el-button>
      </div>
    </el-dialog>

@@ -424,8 +424,8 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取消</el-button>
-        <el-button v-if="fileTitle==='添加文件'" type="primary" @click="submitAddFile">确定</el-button>
-        <el-button v-else-if="fileTitle==='编辑文件'" type="primary" @click="submitEditFile">确定</el-button>
+        <el-button v-positive="'loading'" v-if="fileTitle==='添加文件'" :disabled="false" type="primary" @click="submitAddFile">确定</el-button>
+        <el-button v-positive="'loading'" v-else-if="fileTitle==='编辑文件'" :disabled="false" type="primary" @click="submitEditFile">确定</el-button>
      </div>
    </el-dialog>

@@ -466,8 +466,8 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取消</el-button>
-        <el-button v-if="spareTitle==='添加备件'" type="primary" @click="submitAddSpare">确定</el-button>
-        <el-button v-else-if="spareTitle==='编辑备件'" type="primary" @click="submitEditSpare">确定</el-button>
+        <el-button v-positive="'loading'" v-if="spareTitle==='添加备件'" :disabled="false" type="primary" @click="submitAddSpare">确定</el-button>
+        <el-button v-positive="'loading'" v-else-if="spareTitle==='编辑备件'" :disabled="false" type="primary" @click="submitEditSpare">确定</el-button>
      </div>
    </el-dialog>
    <div v-show="true" id="cjn">
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -1,15 +1,6 @@
 <template>
  <div class="app-container">
    <el-card v-loading="loading">
-      <!--      <el-col :span="6">-->
-      <!--        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">-->
-      <!--          <el-step title="选择项目"/>-->
-      <!--          <el-step title="选择类型"/>-->
-      <!--          <el-step title="浏览"/>-->
-      <!--          <el-step title="导入到数据库"/>-->
-      <!--          <el-step title="传递"/>-->
-      <!--        </el-steps>-->
-      <!--      </el-col>-->
      <el-col :span="6">
        <div style="width: 650px;margin: 0px 380px ">
          <div style="overflow: hidden">