7.23二级库修改

sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue

@@ -1,5 +1,22 @@
 <template>
     <div class="app-container" id="secondStore">
+        <div
+          class="upper-sec"
+        >
+          <div
+            :class="[{ clicked: leaseType == 1 }]"
+            @click="toggleBtn(1)"
+          >
+            长期领用
+          </div>
+          <div
+            :class="[{ clicked: leaseType == 0 }]"
+            @click="toggleBtn(0)"
+
+          >
+            工程领用
+          </div>
+        </div>
         <el-form
             :model="queryParams"
             ref="queryForm"
@@ -148,6 +165,7 @@
                 align="center"
                 prop="proName"
                 :show-overflow-tooltip="true"
+                v-if="leaseType == 0"
             />
             <el-table-column
                 label="类型名称"
@@ -156,10 +174,16 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="规格型号"
+              label="规格型号"
-                align="center"
+              align="center"
-                prop="modelName"
+              prop="modelName"
-                :show-overflow-tooltip="true"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="计量单位"
+              align="center"
+              prop="nuitName"
+              :show-overflow-tooltip="true"
             />
             <el-table-column
                 label="进场数量"
@@ -195,10 +219,6 @@
                 prop="kcNum"
                 :show-overflow-tooltip="true"
             />
-            <!--        <template slot-scope="scope">-->
-            <!--          <span class="clickText" @click="openRecords(scope.row,3)">{{scope.row.kcNum}}</span>-->
-            <!--        </template>-->
-            <!--      </el-table-column>-->
             <el-table-column
                 label="已出库数量"
                 align="center"
@@ -228,12 +248,11 @@
                 </template>
             </el-table-column>
             <el-table-column
-                label="计量单位"
+              label="操作"
-                align="center"
+              align="center"
-                prop="nuitName"
+              width="150"
-                :show-overflow-tooltip="true"
+              v-if="leaseType == 1"
-            />
+            >
-            <el-table-column label="操作" align="center" width="150">
                 <template slot-scope="scope">
                     <el-button
                         size="mini"
@@ -528,6 +547,8 @@ export default {
     components: { Treeselect },
     data() {
         return {
+            // 上方按钮状态
+            leaseType: 1,
             // 遮罩层
             loading: true,
             // 选中数组
@@ -641,10 +662,14 @@ export default {
         this.getUnitList()
         this.getProList()
         this.equipmentType()
-
+        this.getList(this.leaseType)
-        this.getList()
     },
     methods: {
+        // 按钮状态改变
+        toggleBtn (count) {
+          this.leaseType = count;
+          this.getList(this.leaseType);
+        },
         //获取单位
         getUnitList() {
             getUnitData().then((response) => {
@@ -692,8 +717,9 @@ export default {
             })
         },
         /** 查询列表 */
-        getList() {
+        getList(leaseType) {
             this.loading = true
+            this.queryParams.leaseType = leaseType;
             secondaryWarehouseList(this.queryParams).then((response) => {
                 this.deviceList = response.rows
                 this.total = response.total
@@ -716,7 +742,7 @@ export default {
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1
-            this.getList()
+            this.getList(this.leaseType)
         },
         handleDialogQuery() {
             this.dialogQuery.pageNum = 1
@@ -853,6 +879,30 @@ export default {
     width: 60px !important;
     margin-bottom: 10px;
 }
+.upper-sec{
+  display: flex;
+  margin-bottom: 15px;
+  div{
+    box-sizing: border-box;
+    padding: 10px 30px;
+    background-color: #fff;
+    color: #999999;
+    font-size: 14px;
+    cursor: pointer;
+  }
+  div:first-child{
+    border-bottom-left-radius: 3px;
+    border-top-left-radius: 3px;
+  }
+  div:last-child{
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+  }
+  .clicked{
+    background-color: #409EFF;
+    color: #fff;
+  }
+}
 .clickText {
     color: #02a7f0;
     cursor: pointer;

sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue

@@ -17,6 +17,14 @@
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
+          <el-form-item label="框架年份" prop="year">
+            <el-date-picker
+              v-model="queryParams.year"
+              type="year"
+              value-format="yyyy"
+              placeholder="选择年">
+            </el-date-picker>
+          </el-form-item>
             <el-form-item>
                 <el-button
                     type="primary"
@@ -36,6 +44,14 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-bottom"
+                  size="mini"
+                  v-hasPermi="['machinery:parts:add']"
+                >导入</el-button
+                >
                 <el-button
                     type="primary"
                     plain
@@ -55,6 +71,13 @@
                     @click="toggleExpandAll"
                     >展开/折叠</el-button
                 >
+                <el-button
+                  type="info"
+                  plain
+                  icon="el-icon-top"
+                  size="mini"
+                >下载导入模板</el-button
+                >
             </el-col>
             <right-toolbar
                 :showSearch.sync="showSearch"
@@ -267,7 +290,7 @@ export default {
             // 查询参数
             queryParams: {
                 paName: undefined,
-                status: undefined,
+                year: undefined
             },
             // 表单参数
             form: {},
@@ -318,6 +341,7 @@ export default {
     methods: {
         /** 查询部门列表 */
         getList() {
+          console.log(this.queryParams)
             // this.loading = true;
             listPartType(this.queryParams)
                 .then((response) => {
@@ -504,4 +528,4 @@ export default {
     width: 60px !important;
     margin-bottom: 10px;
 }
-</style>
+</style>