Merge branch 'feature/custom' into feature/merge1129

# Conflicts:
#	dist/index.html
#	src/views/asset/basics/index.vue

src/views/asset/basics/index.vue

@@ -83,29 +83,16 @@
             </el-table-column>
             <el-table-column label="牧场" align="center" prop="pastureName" />
             <el-table-column label="设备类别" align="center" prop="eqClassName" />
-            <el-table-column align="center" prop="eqName" width="120">
-              <template slot="header" slot-scope="scope">
-                <div>
-                  设备名称
-                  <!-- <el-popover placement="top" width="200" trigger="click">
-                    <p>多行信息多行信息多行信息<br/>第二行信息</p>
-                    <i class="el-icon-question" slot="reference"></i>
-                  </el-popover> -->
-                  <!-- <el-tooltip placement="top" trigger="click">
-                    <div slot="content">多行信息多行信息多行信息<br/>第二行信息</div>
-                    <i class="el-icon-question"></i>
-                  </el-tooltip> -->
-                </div>
-              </template>
+            <el-table-column label="设备名称" align="center" prop="eqName">
               <template slot-scope="{row}">
                 <div v-if="row.exceed == 1">
                   <div style="background:#EC808D;display:block;line-height: 50px;">{{ row.eqName }}</div>
                 </div>
                 <div v-else>
-                  <div style="display:block;line-height: 50px;">{{ row.eqName }}</div>
+                  <div style="background:#fff;display:block;line-height: 50px;">{{ row.eqName }}</div>
                 </div>
               </template>
-            </el-table-column>
+            </el-table-column> 
             <el-table-column label="设备内部编号" align="center" prop="eqCode" />
            <el-table-column label="财务编号" align="center" prop="financeCode" />
             <el-table-column label="规格" align="center" prop="specification" />

src/views/custom/custom/index.vue

@@ -1182,9 +1182,9 @@ export default {
             }
             // const list1 = this.downList
             const tHeader = [
-              '牧场', '备件名称', '备件编号', '规格', '供应商', '单位', '品牌', '单价', '当前库存', '在库天数','最小库存', '最大库存', '位置', '状态', '合同状态', '零库存']
+              '牧场', '备件名称', '备件编号', '规格', '供应商', '单位', '品牌', '单价', '当前库存', '在库天数','闲置备件','最小库存', '最大库存', '位置', '合同状态', '零库存']
             const filterVal = [
-              'pastureName', 'partName', 'partCode', 'specification', 'providerName', 'unit', 'brand', 'price', 'reportery', 'daysInStorage','minRepertory', 'maxRepertory', 'location', 'statue', 'isZeroStock']
+              'pastureName', 'partName', 'partCode', 'specification', 'providerName', 'unit', 'brand', 'price', 'reportery', 'daysInStorage','xzparts','minRepertory', 'maxRepertory', 'location', 'statue', 'isZeroStock']
             const data1 = this.formatJsonTemp(filterVal, list1)
 
             excel.export_json_to_excel({

src/views/custom/writeoff/index.vue

@@ -41,18 +41,18 @@
       </el-table-column>
       <el-table-column label="牧场" min-width="150px" align="center" prop="pastureName" />
       <el-table-column label="物料凭证号" min-width="150px" align="center" prop="materialCode" />
-      <el-table-column label="物料凭证年度" min-width="150px" align="center" prop="proofYear" />
+      <!-- <el-table-column label="物料凭证年度" min-width="150px" align="center" prop="proofYear" /> -->
       <el-table-column label="凭证中的过账信息" min-width="150px" align="center" prop="chargeDate" />
       <el-table-column label="设备管理平台单号" min-width="150px" align="center" prop="orderNumber" />
 
-      <el-table-column label="是否已开票" min-width="150px" align="center" show-overflow-tooltip v-if="table1.getdataListParm.parammaps.writeoffType == '备件入库' || table1.getdataListParm.parammaps.writeoffType == '备件退货'" >
-            <template slot-scope="scope">
-              <span v-if="scope.row.hasTicket == 1">是</span>
-              <span v-if="scope.row.hasTicket == 0">否</span>
-              <span v-if="scope.row.hasTicket == ''"> </span>
-            </template>
-          </el-table-column>
-      <el-table-column label="设备管理平台行号" min-width="150px" align="center" prop="rowNumber" />
+      <!-- <el-table-column label="是否已开票" min-width="150px" align="center" show-overflow-tooltip v-if="table1.getdataListParm.parammaps.writeoffType == '备件入库' || table1.getdataListParm.parammaps.writeoffType == '备件退货'" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.hasTicket == 1">是</span>
+          <span v-if="scope.row.hasTicket == 0">否</span>
+          <span v-if="scope.row.hasTicket == ''"> </span>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="设备管理平台行号" min-width="150px" align="center" prop="rowNumber" /> -->
       <el-table-column label="状态" min-width="150px" align="center" prop="status" />
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">