实例编码

src/views/modules/tooling/searchToolApply.vue

@@ -66,8 +66,9 @@
           :before-generate="startDownload"
           :before-finish="finishDownload"
           worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{ '导出' }}
+          :class="['el-button', 'el-button--primary', 'el-button--medium', {'is-loading': exportLoading}]">
+          <i v-if="exportLoading" class="el-icon-loading"></i>
+          <span>{{ '导出' }}</span>
         </download-excel>
         <el-button @click="filterVisible = true">搜索</el-button>
       </el-form-item>
@@ -363,13 +364,16 @@
                 :min-width="item.columnWidth"
                 :label="item.columnLabel">
                 <template slot-scope="scope">
-                  <div v-if="(item.columnProp !== 'applyQty')&& (item.columnProp !== 'standardCost')">
+                  <div v-if="(item.columnProp !== 'applyQty') && (item.columnProp !== 'standardCost') && (item.columnProp !== 'instanceCode')">
                     <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
                     <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
                   </div>
-                  <div v-else-if=" (item.columnProp === 'standardCost')">
+                  <div v-else-if="item.columnProp === 'standardCost'">
                     <el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本" style="width:98%"></el-input>
                   </div>
+                  <div v-else-if="item.columnProp === 'instanceCode'">
+                    <el-input v-model="scope.row.instanceCode" placeholder="请输入实例编码" style="width:98%"></el-input>
+                  </div>
                   <div v-else>
                     <el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)" placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width:98%"></el-input>
                   </div>
@@ -1167,6 +1171,7 @@ export default {
       dataList1: [],
       detailList: [],
       toolDetailList: [],
+      exportLoading: false,
       dataListLoading: false,
       // 导出 start
       exportData: [],
@@ -1734,6 +1739,24 @@ export default {
           fixed: '',
           columnWidth: 120
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 106002,
+          serialNumber: '106002Table2InstanceCode',
+          tableId: '106002Table2',
+          tableName: '工具申请明细',
+          columnProp: 'instanceCode',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '实例编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 106002,
@@ -2325,11 +2348,10 @@ export default {
       return this.exportList;
     },
     startDownload() {
-      //  this.exportData = this.dataList
-
+      this.exportLoading = true
     },
     finishDownload() {
-
+      this.exportLoading = false
     },
     fields() {
       let json = "{"