Merge branch 'main' of http://192.168.30.2:3000/bonus/nw-cqdevicemgt-ui

src/api/claimAndRefund/receive.js

@@ -156,6 +156,14 @@ export function getLeaseListAll(params = {}) {
         params: params,
     })
 }
+
+export function getLeaseOutOrder(params = {}) {
+  return request({
+    url: '/material/base/leaseOutDetails/getLeaseOutOrder',
+    method: 'get',
+    params: params,
+  })
+}
 // 根据 领料任务id  获取详情数据
 export function getLeaseListAllCq(params = {}) {
     return request({

src/views/claimAndRefund/secondStore/secondStore.vue

@@ -4,9 +4,9 @@
             <div :class="[{ clicked: leaseType == 1 }]" @click="toggleBtn(1)">
                 长期领用
             </div>
-            <div :class="[{ clicked: leaseType == 0 }]" @click="toggleBtn(0)">
+<!--            <div :class="[{ clicked: leaseType == 0 }]" @click="toggleBtn(0)">
                 工程领用
-            </div>
+            </div>-->
         </div>
         <el-form
             :model="queryParams"

src/views/claimAndreturn/picking/outbound/index.vue

@@ -279,6 +279,9 @@
                         <el-button type="text" @click="onPreviewRecord(row)"
                             >出库记录</el-button
                         >
+                      <el-button type="text" @click="openLld(row)"
+                      >出库单</el-button
+                      >
                     </template>
                 </el-table-column>
 
@@ -423,12 +426,18 @@
                 label-width="100px"
             >
                 <span style="margin-right: 50px">待出库数量：{{ outNum }}</span>
+                <br> <br>
                 <el-form-item label="请输入车牌号" prop="carCode">
                     <el-input v-model="codeOutForm.carCode" maxlength="20" />
                 </el-form-item>
                 <span style="margin-right: 50px; color: red"
-                    >部分设备出库时，需进行装车,需记录车牌号码</span
+                >部分设备出库时，需进行装车,需记录车牌号码</span
                 >
+                <br>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="codeOutForm.remark" maxlength="50" />
+                </el-form-item>
+
             </el-form>
 
             <el-form
@@ -547,8 +556,13 @@
                     <el-input v-model="numOutForm.carCode" maxlength="20" />
                 </el-form-item>
                 <span style="margin-right: 50px; color: red"
-                    >部分设备出库时，需进行装车,需记录车牌号码</span
+                >部分设备出库时，需进行装车,需记录车牌号码</span
                 >
+                <br>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="numOutForm.remark" maxlength="50" />
+                </el-form-item>
+
             </el-form>
             <el-row :gutter="10" class="mb8">
                 <el-col :span="1.5">
@@ -603,27 +617,169 @@
                 </el-table-column>
             </el-table>
         </el-dialog>
+
+      <!-- 领料单弹窗 -->
+      <el-dialog :visible.sync="open" width="800px" append-to-body>
+        <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
+          <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+            <div
+              class="title"
+              style="
+                            text-align: center;
+                            font-weight: 600;
+                            font-size: 16px;
+                        "
+            >
+              出库单
+            </div>
+            <div
+              class="info"
+              style="margin-top: 10px; display: flex; flex-wrap: wrap"
+            >
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>领料单位：</span>{{ leaseOutData.unitName }}
+              </div>
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>工程名称：</span>{{ leaseOutData.proName }}
+              </div>
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>时间：</span>{{ leaseOutData.updateTime }}
+              </div>
+              <div
+                class="item"
+                style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+              >
+                <span>编号：</span>{{ leaseOutData.code }}
+              </div>
+            </div>
+            <el-table
+              :data="leaseOutDetailRecord"
+              class="table"
+              border
+              style="margin-top: 20px; padding: 1px"
+            >
+              <!--          <el-table-column type="selection" width="55" align="center" />-->
+              <el-table-column
+                label="序号"
+                align="center"
+                type="index"
+              />
+              <el-table-column
+                label="类型名称"
+                align="center"
+                prop="typeName"
+              />
+              <el-table-column
+                label="规格型号"
+                align="center"
+                prop="typeModelName"
+              />
+              <el-table-column
+                label="计量单位"
+                align="center"
+                prop="unitName"
+              />
+              <el-table-column
+                label="出库数量"
+                align="center"
+                prop="outNum"
+              />
+              <el-table-column
+                label="设备编码"
+                align="center"
+                prop="maCode"
+              />
+              <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+              />
+              <el-table-column
+                label="出库方式"
+                align="center"
+                prop="manageTypeName"
+              />
+            </el-table>
+
+            <div
+              class="fillIn"
+              style="
+                            margin-top: 30px;
+                            display: flex;
+                            justify-content: space-between;
+                        "
+            >
+              <div class="item" style="width: 25%">
+                <span>审核：</span>
+              </div>
+              <div class="item" style="width: 25%">
+                <span>领料：</span>
+              </div>
+              <div class="item" style="width: 25%">
+                <span>仓库：</span>
+              </div>
+              <div class="item" style="width: 25%">
+                <span>操作人：</span>
+              </div>
+            </div>
+          </vue-easy-print>
+        </div>
+        <div slot="footer" class="dialog-footer" style="text-align: center">
+          <el-button type="primary" @click="print">打 印</el-button>
+          <el-button @click="open = false">关 闭</el-button>
+        </div>
+      </el-dialog>
     </div>
 </template>
 
 <script>
 import {
-    getUnitData,
+  getUnitData,
-    getProData,
+  getProData,
-    getLeaseAuditList,
+  getLeaseAuditList,
-    getLeaseAuditListDetail,
+  getLeaseAuditListDetail,
-    getDetailsByTypeId,
+  getDetailsByTypeId,
-    submitOut,
+  submitOut,
-    submitNumOut,
+  submitNumOut,
-    getLeaseOutDetailRecordApi,
+  getLeaseOutDetailRecordApi, getLeaseListAll, getLeaseOutOrder,
 } from '@/api/claimAndRefund/receive.js'
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import vueEasyPrint from 'vue-easy-print'
 export default {
     name: 'receiveOut',
-    components: { Treeselect },
+    components: { Treeselect,vueEasyPrint },
     data() {
         return {
             // 遮罩层
@@ -638,6 +794,8 @@ export default {
             showSearch: true,
             // 总条数
             total: 0,
+          // 是否显示弹出层
+            open: false,
             // 表格数据
             leaseList: [],
             // 弹出层标题
@@ -683,10 +841,12 @@ export default {
             codeOutForm: {
                 //编码表单-车牌号
                 carCode: undefined,
+                remark: undefined,
             },
             numOutForm: {
                 //数量表单-车牌号
                 carCode: '',
+                remark: '',
             },
             outQuery: {
                 //编码出库-搜索条件
@@ -708,6 +868,9 @@ export default {
             },
             leaseOutDetailsList: [],
             outTime: [],
+          // 领料任务详情数据
+            leaseOutDetailRecord: [],
+            leaseOutData: {},
         }
     },
     created() {
@@ -889,6 +1052,7 @@ export default {
                         maId: item,
                         manageType: 0,
                         carCode: this.codeOutForm.carCode,
+                        remark: this.codeOutForm.remark,
                         typeId: this.outObj.typeId,
                         parentId: this.outObj.parentId,
                         outNum: 1,
@@ -913,6 +1077,7 @@ export default {
         //数量出库保存
         saveNumOut() {
             this.outNumList[0].carCode = this.numOutForm.carCode
+            this.outNumList[0].remark = this.numOutForm.remark
             this.outNumList[0].leaseType = this.leaseType
             let param = this.outNumList
             // console.log(param, '数量出库时参数')
@@ -954,6 +1119,21 @@ export default {
                 this.outRecordVisible = true
             })
         },
+      /* 打开出库单 */
+      async openLld(row) {
+        this.open = true
+
+        const res = await getLeaseOutOrder({ parentId: row.parentId,typeId: row.typeId})
+
+        this.leaseOutDetailRecord = res.data.leaseOutDetailRecord
+        this.leaseOutData = res.data
+
+        console.log('this.leaseApplyData ============', this.leaseApplyData)
+      },
+      // 领料单 打印
+      print() {
+        this.$refs.remarksPrintRef.print()
+      },
 
         async onHandleQuery() {
             const res = await getLeaseOutDetailRecordApi(

src/views/cost/csotSettlement/component/finishAndDetails.vue

@@ -156,6 +156,8 @@ export default {
                 { t_prop: 'trimDay', t_label: '调整天数', t_slot: 't_ipt' },
                 { t_prop: 'realDays', t_label: '实际结算天数' },
                 { t_prop: 'realCosts', t_label: '实际结算金额（元）' },
+                { t_prop: 'remark', t_label: '领料备注' },
+                { t_prop: 'outRemark', t_label: '退料备注' },
                 // { t_prop: '', t_label: '已入账金额（元）' },
                 // { t_prop: '', t_label: '本次结算金额（元）' },
             ],

src/views/cost/csotSettlement/component/other-cost.vue

@@ -7,6 +7,7 @@
             </el-col>
             <el-col :span="14" class="title">
                 其他费用
+              <span class="additional">(如需费用减免可输入负数)</span>
                 <el-button
                     type="text"
                     v-if="pageContent === '完工结算'"
@@ -149,7 +150,8 @@ export default {
                             this.activeIndexCostRemark = ''
                         }
                         const regex_2 =
-                            /^(?!\s*$)(?:(?:[1-9][0-9]{0,7}|100000000)(\.[0-9]{1,2})?|0(\.[0-9]{1,2})?)$/
+                            // /^(?!\s*$)(?:(?:[1-9][0-9]{0,7}|100000000)(\.[0-9]{1,2})?|0(\.[0-9]{1,2})?)$/
+                            /^(?!\s*$)(?:(?:-?[1-9][0-9]{0,7}|-?100000000)(\.[0-9]{1,2})?|0(\.[0-9]{1,2})?)$/
 
                         if (!regex_2.test(e.addCost)) {
                             this.$modal.msgError(
@@ -219,6 +221,12 @@ export default {
         letter-spacing: 4px;
     }
 }
+.additional{
+  font-size: 12px;
+  margin-right: 20px;
+  color: #7e7e7e;
+  letter-spacing: 1px;
+}
 
 ::v-deep .active {
     .el-input__inner:focus {

src/views/repairTest/repair/dialogOneForm.vue

@@ -83,7 +83,7 @@
                             :prop="'premiumList.' + index + '.partNum'"
                             label="配件数量："
                             :rules="{
-                                required: isRequired,
+                                required: domain.partId,
                                 validator: numberIntegerValidator,
                                 trigger: 'blur',
                             }"

src/views/stquery/deviceStatusRecord.vue

@@ -108,7 +108,7 @@
         </el-form>
 
         <!-- <el-col :span="1.5">
-        
+
       </el-col> -->
 
         <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
@@ -159,6 +159,12 @@
                 prop="num"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+              label="待出库数量"
+              align="center"
+              prop="preOutNum"
+              :show-overflow-tooltip="true"
+            />
             <el-table-column
                 label="在用数量"
                 align="center"