优化

sgzb-ui/src/api/claimAndRefund/receive.js

@@ -323,3 +323,12 @@ export function getNumISenough(params) {
         params,
     })
 }
+
+// 车牌号-下拉
+export function getCarCodeListApi(params) {
+    return request({
+        url: '/base/leaseOutDetails/getCarCodeList',
+        method: 'get',
+        params,
+    })
+}

sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue

@@ -364,14 +364,25 @@
                 size="small"
                 :inline="true"
                 label-width="110px"
+                :rules="carCodeRules"
             >
                 <span style="margin-right: 50px">待出库数量：{{ outNum }}</span>
-                <el-form-item label="请输入车牌号" prop="carCode" :rules="{ required: true, message: '请输入车牌号', trigger: 'blur' }">
+                <el-form-item label="请输入车牌号" prop="carCode">
-                    <el-input v-model="codeOutForm.carCode" maxlength="20" />
+                    <el-input
+                        v-model="codeOutForm.carCode"
+                        maxlength="20"
+                        :disabled="!noCarCode"
+                    />
                 </el-form-item>
                 <span style="margin-right: 50px; color: red"
                     >部分设备出库时，需进行装车,需记录车牌号码</span
                 >
+                <el-switch
+                    v-model="noCarCode"
+                    active-text="有车牌"
+                    inactive-text="无车牌"
+                    @change="handleCarCode(1)"
+                ></el-switch>
             </el-form>
 
             <el-form
@@ -482,16 +493,27 @@
                 size="small"
                 :inline="true"
                 label-width="110px"
+                :rules="carCodeRules"
             >
                 <!-- <span style="margin-right: 50px;">
             待出库数量：{{outNum}}
         </span>-->
-                <el-form-item label="请输入车牌号" prop="carCode" :rules="{ required: true, message: '请输入车牌号', trigger: 'blur' }">
+                <el-form-item label="请输入车牌号" prop="carCode">
-                    <el-input v-model="numOutForm.carCode" maxlength="20" />
+                    <el-input
+                        v-model="numOutForm.carCode"
+                        maxlength="20"
+                        :disabled="!noCarCode"
+                    />
                 </el-form-item>
                 <span style="margin-right: 50px; color: red"
                     >部分设备出库时，需进行装车,需记录车牌号码</span
                 >
+                <el-switch
+                    v-model="noCarCode"
+                    active-text="有车牌"
+                    inactive-text="无车牌"
+                    @change="handleCarCode(2)"
+                ></el-switch>
             </el-form>
             <el-row :gutter="10" class="mb8">
                 <el-col :span="1.5">
@@ -553,7 +575,47 @@
             @closeDialogOuter="closeDialogOuter"
         >
             <template slot="outerContent">
-                <VueEasyPrint tableShow ref="remarksPrintRef" style="padding: 0 10px; width: 750px;">
+                <el-form
+                    :model="outboundParams"
+                    ref="dialogQuery"
+                    size="small"
+                    inline
+                    @submit.native.prevent
+                >
+                    <el-form-item label="车牌号：" prop="carCode">
+                        <el-select
+                            v-model="outboundParams.carCode"
+                            placeholder="请输入车牌号"
+                            clearable
+                            style="width: 200px"
+                        >
+                            <el-option
+                                v-for="(item, index) in carCodeList"
+                                :key="item.index"
+                                :label="item.label"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button
+                            type="primary"
+                            icon="el-icon-search"
+                            @click="queryOutBoundList"
+                            >查询</el-button
+                        >
+                        <el-button
+                            icon="el-icon-refresh"
+                            @click="handleResetCar"
+                            >重置</el-button
+                        >
+                    </el-form-item>
+                </el-form>
+                <VueEasyPrint
+                    tableShow
+                    ref="remarksPrintRef"
+                    style="padding: 0 10px; width: 750px"
+                >
                     <!-- <el-row :gutter="20">
                         <el-col span="6">申请人：</el-col>
                         <el-col span="6">领料工程：</el-col>
@@ -575,7 +637,10 @@
                             领料工程：<span>{{ proName }}</span>
                         </li>
                     </ul>
-                    <el-table style="margin: 15px 0; padding: 1px;" :data="outboundOrderList">
+                    <el-table
+                        style="margin: 15px 0; padding: 1px"
+                        :data="outboundOrderList"
+                    >
                         <el-table-column
                             align="center"
                             label="序号"
@@ -656,6 +721,12 @@
                         @click="handlePrinting()"
                         >打 印</el-button
                     >
+                    <el-button
+                        size="mini"
+                        icon="el-icon-download"
+                        @click="handleExportOuter"
+                        >导 出</el-button
+                    >
                 </el-row>
             </template>
         </DialogModel>
@@ -673,6 +744,7 @@ import {
     submitNumOut,
     outboundCompleted,
     outboundOrderApi,
+    getCarCodeListApi,
 } from '@/api/claimAndRefund/receive.js'
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
@@ -770,7 +842,9 @@ export default {
                 parentId: '',
                 pageNum: 1,
                 pageSize: 10,
+                carCode: '',
             },
+            carCodeList: [],
             // 出库单 弹框配置项
             dialogConfig: {
                 outerWidth: '800px',
@@ -779,9 +853,30 @@ export default {
             },
             // 弹框内工程名称
             detailsProName: '',
+            noCarCode: true, // 无车牌号
         }
     },
-
+    computed: {
+        carCodeRules() {
+            return {
+                carCode: !this.noCarCode
+                    ? []
+                    : [
+                          {
+                              required: true,
+                              message: '请输入车牌号',
+                              trigger: 'blur',
+                          },
+                          {
+                              pattern:
+                                  /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/,
+                              message: '请输入正确的车牌号',
+                              trigger: 'blur',
+                          },
+                      ],
+            }
+        },
+    },
     created() {
         this.getTypeList()
         this.getUnitList()
@@ -796,6 +891,19 @@ export default {
         }
     },
     methods: {
+        // 获取车牌号
+        getCarCodeList() {
+            getCarCodeListApi({ parentId: this.outboundParams.parentId }).then(
+                (res) => {
+                    res.data.forEach((item) => {
+                        this.carCodeList.push({
+                            label: item,
+                            value: item,
+                        })
+                    })
+                },
+            )
+        },
         //获取单位
         getUnitList() {
             getUnitData().then((response) => {
@@ -989,6 +1097,23 @@ export default {
                 return false
             }
         },
+        handleResetCar() {
+            this.outboundParams.carCode = ''
+            this.queryOutBoundList()
+        },
+        handleCarCode(type) {
+            if (type == 1) {
+                this.codeOutForm.carCode = this.noCarCode ? '' : '无车牌'
+                this.$nextTick(() => {
+                    this.$refs.codeOutForm.clearValidate('carCode')
+                })
+            } else {
+                this.numOutForm.carCode = this.noCarCode ? '' : '无车牌'
+                this.$nextTick(() => {
+                    this.$refs.numOutForm.clearValidate()
+                })
+            }
+        },
         //编码出库保存
         saveCodeOut() {
             this.$refs.codeOutForm.validate((valid) => {
@@ -1052,13 +1177,19 @@ export default {
 
         /** 导出按钮操作 */
         handleExport() {
-            this.downloadJson(
+            this.download(
                 'base/tm_task/export',
-                JSON.stringify(this.queryParams),
+                { ...this.queryParams },
                 `领料出库_${new Date().getTime()}.xlsx`,
             )
         },
-
+        handleExportOuter() {
+            this.download(
+                'base/leaseOutDetails/exportOutboundOrder',
+                { parentId: this.outboundParams.parentId },
+                `出库单_${new Date().getTime()}.xlsx`,
+            )
+        },
         // 当前用户是否可以出库
         isOutboundFun(ids) {
             if (!ids) {
@@ -1079,6 +1210,7 @@ export default {
             this.proName = proName
             this.unitName = unitName
             this.outboundParams.parentId = row.id
+            this.getCarCodeList()
             this.queryOutBoundList()
             this.dialogConfig.outerVisible = true
         },

sgzb-ui/src/views/stquery/deviceInStoreQuery.vue

@@ -280,6 +280,8 @@ export default {
 
         /** 导出按钮操作 */
         handleExport() {
+            this.queryParams.startTime = this.queryParams.time && this.queryParams.time[0],
+            this.queryParams.endTime = this.queryParams.time && this.queryParams.time[1],
             this.download(
                 'material/inputRecord/export',
                 {

sgzb-ui/src/views/stquery/deviceScrapQuery.vue

@@ -346,6 +346,8 @@ export default {
 
         /** 导出按钮操作 */
         handleExport() {
+            this.queryParams.startTime = this.queryParams.time && this.queryParams.time[0],
+            this.queryParams.endTime = this.queryParams.time && this.queryParams.time[1],
             this.download(
                 'material/scrapRecord/export',
                 {

sgzb-ui/src/views/stquery/projUsingRecord.vue

@@ -687,6 +687,8 @@ export default {
 
         /** 导出按钮操作 */
         handleExport() {
+            this.queryParams.startTime = this.queryParams.time && this.queryParams.time[0],
+            this.queryParams.endTime = this.queryParams.time && this.queryParams.time[1],
             this.download(
                 'material/projUsingRecord/export',
                 {