fix:bug修改

sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue

@@ -1,13 +1,6 @@
 <template>
   <div class="app-container" id="returnInDetail">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="80px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <!-- <el-form-item label="关键字" prop="keyword">
           <el-input
             v-model="queryParams.keyword"
@@ -19,33 +12,15 @@
       </el-form-item>-->
 
       <el-form-item label="类型名称" prop="typeId">
-        <el-select
-          v-model="queryParams.typeId"
-          placeholder="请选择类型名称"
-          clearable
-          filterable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="typeItem in typeList"
-            :key="typeItem.typeId"
-            :label="typeItem.typeName"
-            :value="typeItem.typeId"
-          />
+        <el-select v-model="queryParams.typeId" placeholder="请选择类型名称" clearable filterable style="width: 240px">
+          <el-option v-for="typeItem in typeList" :key="typeItem.typeId" :label="typeItem.typeName"
+            :value="typeItem.typeId" />
         </el-select>
       </el-form-item>
       <el-form-item label="规格型号" prop="modelId">
-        <treeselect
-          v-model="queryParams.modelId"
-          default-expand-all
-          :options="equipmentTypeList"
-          placeholder="请选择规格型号"
-          :disable-branch-nodes="true"
-          style="width: 240px;"
-          noChildrenText="没有数据了"
-          noOptionsText="没有数据"
-          noResultsText="没有搜索结果"
-        />
+        <treeselect v-model="queryParams.modelId" default-expand-all :options="equipmentTypeList" placeholder="请选择规格型号"
+          :disable-branch-nodes="true" style="width: 240px;" noChildrenText="没有数据了" noOptionsText="没有数据"
+          noResultsText="没有搜索结果" />
       </el-form-item>
 
       <el-form-item>
@@ -67,9 +42,9 @@
     <el-table v-loading="loading" :data="deviceList">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
+        <template scope="scope">
           <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-          </template>
+        </template>
       </el-table-column>
       <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
       <el-table-column type="expand" v-if="isPlural">
@@ -78,82 +53,48 @@
             <el-table :data="scope.row.maTypeDetails" style="width: 100%">
               <!-- 子表格的列 -->
               <el-table-column label="序号" align="center" type="index" />
-              <el-table-column
-                label="类型名称"
-                align="center"
-                prop="typeName"
-                :show-overflow-tooltip="true"
-              />
-              <el-table-column
-                label="规格型号"
-                align="center"
-                prop="typeModelName"
-                :show-overflow-tooltip="true"
-              />
-              <el-table-column
-                label="单位"
-                align="center"
-                prop="unitName"
-                :show-overflow-tooltip="true"
-              />
-              <el-table-column
-                label="预领数量"
-                align="center"
-                prop="partNum"
-                :show-overflow-tooltip="true"
-              />
+              <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+              <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
+              <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+              <el-table-column label="预领数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
             </el-table>
           </div>
         </template>
       </el-table-column>
       <el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
       <el-table-column label="申请数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
-      <el-table-column label="退料数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
+      <el-table-column label="退料数量1" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.partNum = scope.row.manageType == 0 || scope.row.manageType == 1 ? scope.row.num :
+            scope.row.partNum
+            }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            @click="handleViewCode(scope.row)"
-            v-if="scope.row.manageType=='0'||scope.row.manageType=='1'||scope.row.manageType=='2'"
-          >查看</el-button>
+          <el-button size="mini" @click="handleViewCode(scope.row)"
+            v-if="scope.row.manageType == '0' || scope.row.manageType == '1' || scope.row.manageType == '2'">查看</el-button>
           <!-- <el-button
             size="mini"
             @click="handleViewNum(scope.row)"
             v-if="scope.row.manageType=='1'"
           >查看</el-button>-->
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleCodeReturn(scope.row)"
-            v-if="!isView&&scope.row.manageType=='0'&&scope.row.num>0"
-          >编码退料</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="handleNumReturn(scope.row)"
-            v-if="!isView&&(scope.row.manageType=='1'||scope.row.manageType=='2')&&scope.row.num>0"
-          >数量退料</el-button>
-          <el-button
-            size="mini"
-            icon="el-icon-zoom-in"
-            @click="handleBackup(scope.row)"
-            v-if="!isView&&scope.row.num<scope.row.preNum"
-          >撤回</el-button>
+          <el-button size="mini" type="primary" @click="handleCodeReturn(scope.row)"
+            v-if="!isView && scope.row.manageType == '0' && scope.row.num > 0">编码退料</el-button>
+          <el-button size="mini" type="primary" @click="handleNumReturn(scope.row)"
+            v-if="!isView && (scope.row.manageType == '1' || scope.row.manageType == '2') && scope.row.num > 0">数量退料</el-button>
+          <el-button size="mini" icon="el-icon-zoom-in" @click="handleBackup(scope.row)"
+            v-if="!isView && scope.row.num < scope.row.preNum">撤回</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 编码退料弹窗 -->
     <el-dialog :title="title" :visible.sync="openCode" width="1200px" append-to-body>
-      <div style="margin-left: 40px;margin-bottom: 10px;">退料数量：{{returnNum}}</div>
+      <div style="margin-left: 40px;margin-bottom: 10px;">退料数量：{{ returnNum }}</div>
       <el-form :model="codeQuery" ref="codeQuery" size="small" :inline="true" label-width="100px">
         <el-form-item label="设备编码" prop="maCode">
           <el-input v-model="codeQuery.maCode" maxlength="20" />
@@ -166,243 +107,108 @@
 
       <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
         <el-col :span="1.5">
-          <el-button
-            type="success"
-            size="mini"
-            :disabled="multiple"
-            @click="saveCodeBackBatch(1)"
-          >批量合格</el-button>
+          <el-button type="success" size="mini" :disabled="multiple" @click="saveCodeBackBatch(1)">批量合格</el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="primary"
-            size="mini"
-            :disabled="multiple"
-            @click="saveCodeBackBatch(2)"
-          >批量维修</el-button>
+          <el-button type="primary" size="mini" :disabled="multiple" @click="saveCodeBackBatch(2)">批量维修</el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="warning"
-            size="mini"
-            :disabled="multiple"
-            @click="saveCodeBackBatch(3)"
-          >批量报废</el-button>
+          <el-button type="warning" size="mini" :disabled="multiple" @click="saveCodeBackBatch(3)">批量报废</el-button>
         </el-col>
       </el-row>
-      <el-table
-        v-loading="loading"
-        :data="codeList"
-        height="500"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table v-loading="loading" :data="codeList" height="500" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" width="80" type="index">
-            <template scope="scope">
+          <template scope="scope">
             <span>{{ (codeQuery.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-            </template>
+          </template>
         </el-table-column>
         <el-table-column label="设备类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column
-          label="规格型号"
-          align="center"
-          prop="typeModelName"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
         <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="maStatus" :show-overflow-tooltip="true" />
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-          v-if="!dialogIsView"
-          width="250"
-        >
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!dialogIsView"
+          width="250">
           <template slot-scope="scope">
-            <el-button size="mini" type="success" @click="saveCodeBack(scope.row,1)">合格</el-button>
-            <el-button size="mini" type="primary" @click="saveCodeBack(scope.row,2)">待维修</el-button>
-            <el-button size="mini" type="warning" @click="saveCodeBack(scope.row,3)">预报废</el-button>
+            <el-button size="mini" type="success" @click="saveCodeBack(scope.row, 1)">合格</el-button>
+            <el-button size="mini" type="primary" @click="saveCodeBack(scope.row, 2)">待维修</el-button>
+            <el-button size="mini" type="warning" @click="saveCodeBack(scope.row, 3)">预报废</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="codeTotal>0"
-        :total="codeTotal"
-        :page.sync="codeQuery.pageNum"
-        :limit.sync="codeQuery.pageSize"
-        @pagination="getCodeList"
-      />
+      <pagination v-show="codeTotal > 0" :total="codeTotal" :page.sync="codeQuery.pageNum"
+        :limit.sync="codeQuery.pageSize" @pagination="getCodeList" />
     </el-dialog>
 
     <!-- 数量退料弹窗 -->
     <el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body>
-      <div v-if="dialogData.typeMange==1">
-        <div style="margin-left: 40px;margin-bottom: 10px;">退料数量：{{returnNum}}</div>
+      <div v-if="dialogData.typeMange == 1">
+        <div style="margin-left: 40px;margin-bottom: 10px;">退料数量：{{ returnNum }}</div>
         <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              size="mini"
-              v-if="returnNum>0"
-              @click="saveNumReturn(dialogData.typeMange)"
-            >保存</el-button>
+            <el-button type="primary" size="mini" v-if="returnNum > 0"
+              @click="saveNumReturn(dialogData.typeMange)">保存</el-button>
           </el-col>
         </el-row>
         <el-table v-loading="loading" :data="numList" height="500">
           <el-table-column label="序号" align="center" type="index" />
-          <el-table-column
-            label="类型名称"
-            align="center"
-            prop="typeName"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="规格型号"
-            align="center"
-            prop="typeCode"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="退料数量"
-            align="center"
-            prop="backNum"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="合格数量"
-            align="center"
-            prop="qualifiedNum"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+          <el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
+          <el-table-column label="退料数量" align="center" prop="backNum" :show-overflow-tooltip="true" />
+          <el-table-column label="合格数量" align="center" prop="qualifiedNum" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.qualifiedNum"
-                placeholder="请输入合格数量"
-                type="number"
-                :min="0"
-                clearable
-                :disabled="dialogIsView"
-                style="width: 100%"
-              />
+              <el-input v-model.number="scope.row.qualifiedNum" placeholder="请输入合格数量" type="number" :min="0" clearable
+                :disabled="dialogIsView" style="width: 100%" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="待维修数量"
-            align="center"
-            prop="serviceNum"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column label="待维修数量" align="center" prop="serviceNum" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.serviceNum"
-                placeholder="请输入待维修数量"
-                type="number"
-                :min="0"
-                clearable
-                :disabled="dialogIsView"
-                style="width: 100%"
-              />
+              <el-input v-model.number="scope.row.serviceNum" placeholder="请输入待维修数量" type="number" :min="0" clearable
+                :disabled="dialogIsView" style="width: 100%" />
             </template>
           </el-table-column>
           <el-table-column label="待报废数量" align="center" prop="scrapNum">
             <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.scrapNum"
-                placeholder="请输入待报废数量"
-                type="number"
-                :min="0"
-                clearable
-                :disabled="dialogIsView"
-                style="width: 100%"
-              />
+              <el-input v-model.number="scope.row.scrapNum" placeholder="请输入待报废数量" type="number" :min="0" clearable
+                :disabled="dialogIsView" style="width: 100%" />
             </template>
           </el-table-column>
           <!-- <el-table-column label="报废信息" align="center" prop="" :show-overflow-tooltip="true" /> -->
         </el-table>
       </div>
       <div v-else>
-        <div
-          style="margin-bottom: 30px;"
-        >接收抱杆类型：{{dialogData.typeName}}，型号：{{dialogData.typeCode}}，付数：{{returnNum}}。接收明细如下</div>
+        <div style="margin-bottom: 30px;">
+          接收抱杆类型：{{ dialogData.typeName }}，型号：{{ dialogData.typeCode }}，付数：{{ returnNum }}。接收明细如下
+        </div>
         <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
           <el-col :span="1.5">
-            <el-button
-              type="primary"
-              size="mini"
-              v-if="returnNum>0"
-              @click="saveNumReturn(dialogData.typeMange)"
-            >保存</el-button>
+            <el-button type="primary" size="mini" v-if="returnNum > 0"
+              @click="saveNumReturn(dialogData.typeMange)">保存</el-button>
           </el-col>
         </el-row>
         <el-table :data="dialogData.maTypeDetails" style="width: 100%">
           <!-- 子表格的列 -->
           <el-table-column label="序号" align="center" type="index" />
-          <el-table-column
-            label="设备类型"
-            align="center"
-            prop="typeName"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="规格型号"
-            align="center"
-            prop="typeModelName"
-            :show-overflow-tooltip="true"
-          />
+          <el-table-column label="设备类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
+          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
           <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-          <el-table-column
-            label="应退数量"
-            align="center"
-            prop="partNum"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="合格数量"
-            align="center"
-            prop="qualifiedNum"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column label="应退数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
+          <el-table-column label="合格数量" align="center" prop="qualifiedNum" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.qualifiedNum"
-                placeholder="请输入合格数量"
-                type="number"
-                :min="0"
-                clearable
-                :disabled="dialogIsView"
-                style="width: 100%"
-              />
+              <el-input v-model.number="scope.row.qualifiedNum" placeholder="请输入合格数量" type="number" :min="0" clearable
+                :disabled="dialogIsView" style="width: 100%" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="待维修数量"
-            align="center"
-            prop="serviceNum"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column label="待维修数量" align="center" prop="serviceNum" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.serviceNum"
-                placeholder="请输入待维修数量"
-                type="number"
-                :min="0"
-                clearable
-                :disabled="dialogIsView"
-                style="width: 100%"
-              />
+              <el-input v-model.number="scope.row.serviceNum" placeholder="请输入待维修数量" type="number" :min="0" clearable
+                :disabled="dialogIsView" style="width: 100%" />
             </template>
           </el-table-column>
           <el-table-column label="待报废数量" align="center" prop="scrapNum">
             <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.scrapNum"
-                placeholder="请输入待报废数量"
-                type="number"
-                :min="0"
-                clearable
-                :disabled="dialogIsView"
-                style="width: 100%"
-              />
+              <el-input v-model.number="scope.row.scrapNum" placeholder="请输入待报废数量" type="number" :min="0" clearable
+                :disabled="dialogIsView" style="width: 100%" />
             </template>
           </el-table-column>
         </el-table>
@@ -411,7 +217,7 @@
   </div>
 </template>
 
-  <script>
+<script>
 import {
   receiveView,
   getBackMachine,
@@ -450,7 +256,7 @@ export default {
       // 弹出层标题
       title: '',
       isView: false, //是否为查看
-      isPlural:false,
+      isPlural: false,
       dialogIsView: false, //弹窗是否为查看
       openIn: false,
       // 日期范围
@@ -545,14 +351,14 @@ export default {
       this.loading = true
       receiveView(this.queryParams).then(response => {
         this.deviceList = response.data.rows;
-        this.deviceList.forEach(item=>{
-          if(item.manageType=='0'||item.manageType=='1'){
-            item.partNum = item.num
-          }else{
-            item.partNum = item.partNum
-          }
-          if(item.maTypeDetails.length>0){
-            this.isPlural=true;
+        this.deviceList.forEach(item => {
+          // if (item.manageType == '0' || item.manageType == '1') {
+          //   item.partNum = item.num
+          // } else {
+          //   item.partNum = item.partNum
+          // }
+          if (item.maTypeDetails.length > 0) {
+            this.isPlural = true;
           }
         })
 
@@ -692,13 +498,13 @@ export default {
       this.dialogData.typeMange = row.manageType
       this.dialogData.typeName = row.typeName
       this.dialogData.typeCode = row.typeCode
-      if(row.maTypeDetails){
-          row.maTypeDetails.forEach(item => {
-            this.$set(item, 'qualifiedNum', undefined)
-            this.$set(item, 'serviceNum', undefined)
-            this.$set(item, 'scrapNum', undefined)
-          })
-          this.dialogData.maTypeDetails = row.maTypeDetails
+      if (row.maTypeDetails) {
+        row.maTypeDetails.forEach(item => {
+          this.$set(item, 'qualifiedNum', undefined)
+          this.$set(item, 'serviceNum', undefined)
+          this.$set(item, 'scrapNum', undefined)
+        })
+        this.dialogData.maTypeDetails = row.maTypeDetails
       }
       this.numList = [row]
       // this.getNumList()
@@ -712,8 +518,8 @@ export default {
         manageType: row.manageType,
         createBy: this.createBy,
       }
-      if(row.maTypeDetails&&row.maTypeDetails.length>0){
-        param.typeIds = row.maTypeDetails.map(item=>{return item.modelId})
+      if (row.maTypeDetails && row.maTypeDetails.length > 0) {
+        param.typeIds = row.maTypeDetails.map(item => { return item.modelId })
       }
       console.log(param)
       revoke(param).then(response => {
@@ -778,7 +584,7 @@ export default {
       let arr = []
       for (const item of data) {
         let sumUnmber = (item.qualifiedNum || 0) + (item.serviceNum || 0) + (item.scrapNum || 0)
-        if (sumUnmber > item.partNum&&sumUnmber > item.num) {
+        if (sumUnmber > item.partNum && sumUnmber > item.num) {
           this.$modal.msgError('退料总量已大于待退料数量！')
           return
         } else {
@@ -902,11 +708,12 @@ export default {
   },
 }
 </script>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
   width: 60px !important;
   margin-bottom: 10px;
 }
+
 .clickText {
   color: #02a7f0;
   cursor: pointer;

sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue

@@ -1,25 +1,9 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    v-loading.fullscreen.lock="fullscreenLoading"
-    :before-close="cancel"
-    :title="dialogTitle"
-    :visible.sync="dialogShowFlag"
-    append-to-body
-    width="600px"
-  >
+  <el-dialog v-dialogDrag v-loading.fullscreen.lock="fullscreenLoading" :before-close="cancel" :title="dialogTitle"
+    :visible.sync="dialogShowFlag" append-to-body width="600px">
     <div class="form_box_one">
-      <el-form
-        ref="dynamicValidateForm"
-        :model="dynamicValidateForm"
-        class="demo-dynamic"
-        label-width="100px"
-      >
-        <div
-          v-for="(domain, index) in dynamicValidateForm.premiumList"
-          :key="domain.key"
-          class="bor_box"
-        >
+      <el-form ref="dynamicValidateForm" :model="dynamicValidateForm" class="demo-dynamic" label-width="100px">
+        <div v-for="(domain, index) in dynamicValidateForm.premiumList" :key="domain.key" class="bor_box">
           <p class="form_box_title">编码管理设备</p>
           <div class="form_box_line"></div>
           <div class="form_box_item">
@@ -29,48 +13,24 @@
                 trigger: 'blur',
               }"
               label="选择配件：" -->
-            <el-form-item
-              :prop="'premiumList.' + index + '.partName'"
-              label="配件名称："
-            >
-              <el-input
-                v-model="domain.partName"
-                placeholder="请输入"
-                size="small" maxlength="50" 
-                style="width: 350px"
-              ></el-input>
+            <el-form-item :prop="'premiumList.' + index + '.partName'" label="配件名称：">
+              <el-input v-model="domain.partName" placeholder="请输入" size="small" maxlength="50"
+                style="width: 350px"></el-input>
             </el-form-item>
-            <el-form-item
-              :prop="'premiumList.' + index + '.partType'"
-              label="是否收费："
-            >
+            <el-form-item :prop="'premiumList.' + index + '.partType'" label="是否收费：">
               <el-radio-group style="width: 350px" v-model="domain.partType">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item
-              v-if="index == 0"
-              :prop="'premiumList.' + index + '.supplierId'"
-              label="选择厂家："
-              :rules="{
-                message: '请选择厂家',
-                required: true,
-                trigger: 'blur',
-              }"
-            >
-              <el-select
-                v-model="domain.supplierId"
-                placeholder="请选择"
-                size="small" filterable
-                style="width: 350px"
-              >
-                <el-option
-                  v-for="dict in supplierSelectList"
-                  :key="dict.supplierId"
-                  :label="dict.supplier"
-                  :value="dict.supplierId"
-                />
+            <el-form-item v-if="index == 0" :prop="'premiumList.' + index + '.supplierId'" label="选择厂家：" :rules="{
+              message: '请选择厂家',
+              required: true,
+              trigger: 'blur',
+            }">
+              <el-select v-model="domain.supplierId" placeholder="请选择" size="small" filterable style="width: 350px">
+                <el-option v-for="dict in supplierSelectList" :key="dict.supplierId" :label="dict.supplier"
+                  :value="dict.supplierId" />
               </el-select>
             </el-form-item>
             <!-- <el-form-item
@@ -83,72 +43,33 @@
                 trigger: 'blur',
               }"
             > -->
-            <el-form-item
-              :prop="'premiumList.' + index + '.partPrice'"
-              label="配件单价(元)："
-              label-width="120px"
-            >
-              <el-input
-                v-model="domain.partPrice"
-                placeholder="请输入"
-                size="small" maxlength="10" 
-                style="width: 330px"
-              ></el-input>
+            <el-form-item :prop="'premiumList.' + index + '.partPrice'" label="配件单价(元)：" label-width="120px">
+              <el-input v-model="domain.partPrice" placeholder="请输入" size="small" maxlength="10"
+                style="width: 330px"></el-input>
             </el-form-item>
-            <el-form-item
-              :prop="'premiumList.' + index + '.partNum'"
-              label="配件数量："
-              :rules="{
-                required: false,
-                validator: numberIntegerValidator,
-                trigger: 'blur',
-              }"
-            >
-              <el-input
-                v-model="domain.partNum"
-                placeholder="请输入"
-                size="small" maxlength="10" 
-                style="width: 350px"
-              ></el-input>
+            <el-form-item :prop="'premiumList.' + index + '.partNum'" label="配件数量：" :rules="{
+              required: false,
+              validator: numberIntegerValidator,
+              trigger: 'blur',
+            }">
+              <el-input v-model="domain.partNum" placeholder="请输入" size="small" maxlength="10"
+                style="width: 350px"></el-input>
             </el-form-item>
-            <el-form-item
-              :prop="'premiumList.' + index + '.repairContent'"
-              label="维修内容："
-            >
-              <el-input
-                v-model="domain.repairContent"
-                maxlength="100"
-                placeholder="请输入"
-                show-word-limit
-                size="small"
-                style="width: 350px"
-                type="textarea"
-              ></el-input>
+            <el-form-item :prop="'premiumList.' + index + '.repairContent'" label="维修内容：">
+              <el-input v-model="domain.repairContent" maxlength="100" placeholder="请输入" show-word-limit size="small"
+                style="width: 350px" type="textarea"></el-input>
             </el-form-item>
           </div>
         </div>
       </el-form>
-      <div
-        slot="footer"
-        class="dialog-footer"
-        v-if="rowObj.code !== null && rowObj.code !== ''"
-      >
+      <div slot="footer" class="dialog-footer" v-if="rowObj.code !== null && rowObj.code !== ''">
         <el-button @click="cancel">取消</el-button>
         <el-button type="primary" @click="submit">保存</el-button>
       </div>
     </div>
     <div class="form_box_two">
-      <el-form
-        ref="dynamicValidateFormTwo"
-        :model="dynamicValidateFormTwo"
-        class="demo-dynamic"
-        label-width="100px"
-      >
-        <div
-          v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo"
-          :key="domain.key"
-          class="bor_box"
-        >
+      <el-form ref="dynamicValidateFormTwo" :model="dynamicValidateFormTwo" class="demo-dynamic" label-width="100px">
+        <div v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo" :key="domain.key" class="bor_box">
           <p class="form_box_title">数量管理设备</p>
           <div class="form_box_line"></div>
           <div class="form_box_item">
@@ -158,62 +79,32 @@
                 trigger: 'blur',
               }"
               label="选择配件：" -->
-              <el-form-item
-              :prop="'premiumListTwo.' + index + '.repairNum'"
-              label="维修数量："
-              :rules="{
-                required: true,
-                validator: numberIntegerValidator,
-                trigger: 'blur',
-              }"
-            >
-              <el-input
-                v-model="domain.repairNum"
-                placeholder="请输入"
-                size="small" maxlength="10" 
-                style="width: 350px"
-              ></el-input>
+            <el-form-item :prop="'premiumListTwo.' + index + '.repairNum'" label="维修数量：" :rules="{
+              required: true,
+              validator: numberIntegerValidator,
+              trigger: 'blur',
+            }">
+              <el-input v-model="domain.repairNum" placeholder="请输入" size="small" maxlength="10"
+                style="width: 350px"></el-input>
             </el-form-item>
-            <el-form-item
-              label="配件名称："
-            >
-              <el-input
-                v-model="domain.partName"
-                placeholder="请输入"
-                size="small" maxlength="50" 
-                style="width: 350px"
-              ></el-input>
+            <el-form-item label="配件名称：">
+              <el-input v-model="domain.partName" placeholder="请输入" size="small" maxlength="50"
+                style="width: 350px"></el-input>
             </el-form-item>
-            <el-form-item
-              label="是否收费："
-            >
+            <el-form-item label="是否收费：">
               <el-radio-group style="width: 350px" v-model="domain.partType">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item
-              v-if="index == 0"
-              :prop="'premiumListTwo.' + index + '.supplierId'"
-              label="选择厂家："
-              :rules="{
-                message: '请选择厂家',
-                required: true,
-                trigger: 'blur',
-              }"
-            >
-              <el-select
-                v-model="domain.supplierId"
-                placeholder="请选择"
-                size="small" filterable
-                style="width: 350px"
-              >
-                <el-option
-                  v-for="dict in supplierSelectList"
-                  :key="dict.supplierId"
-                  :label="dict.supplier"
-                  :value="dict.supplierId"
-                />
+            <el-form-item v-if="index == 0" :prop="'premiumListTwo.' + index + '.supplierId'" label="选择厂家：" :rules="{
+              message: '请选择厂家',
+              required: true,
+              trigger: 'blur',
+            }">
+              <el-select v-model="domain.supplierId" placeholder="请选择" size="small" filterable style="width: 350px">
+                <el-option v-for="dict in supplierSelectList" :key="dict.supplierId" :label="dict.supplier"
+                  :value="dict.supplierId" />
               </el-select>
             </el-form-item>
             <!-- <el-form-item
@@ -226,45 +117,22 @@
                 trigger: 'blur',
               }"
             > -->
-            <el-form-item
-              label="配件单价(元)："
-              label-width="120px"
-            >
-              <el-input
-                v-model="domain.partPrice"
-                placeholder="请输入"
-                size="small" maxlength="10" 
-                style="width: 330px"
-              ></el-input>
+            <el-form-item label="配件单价(元)：" label-width="120px">
+              <el-input v-model="domain.partPrice" placeholder="请输入" size="small" maxlength="10"
+                style="width: 330px"></el-input>
             </el-form-item>
-            <el-form-item
-              label="配件数量："
-              :rules="{
-                required: false,
-                validator: numberIntegerValidator,
-                trigger: 'blur',
-              }"
-            >
-              <el-input
-                v-model="domain.partNum"
-                placeholder="请输入"
-                size="small" maxlength="10" 
-                style="width: 350px"
-              ></el-input>
+            <el-form-item label="配件数量：" :rules="{
+              required: false,
+              validator: numberIntegerValidator,
+              trigger: 'blur',
+            }">
+              <el-input v-model="domain.partNum" placeholder="请输入" size="small" maxlength="10"
+                style="width: 350px"></el-input>
             </el-form-item>
 
-            <el-form-item
-              label="维修内容："
-            >
-              <el-input
-                v-model="domain.repairContent"
-                maxlength="100"
-                placeholder="请输入"
-                show-word-limit
-                size="small"
-                style="width: 350px"
-                type="textarea"
-              ></el-input>
+            <el-form-item label="维修内容：">
+              <el-input v-model="domain.repairContent" maxlength="100" placeholder="请输入" show-word-limit size="small"
+                style="width: 350px" type="textarea"></el-input>
             </el-form-item>
           </div>
 
@@ -282,11 +150,7 @@
           </div> -->
         </div>
       </el-form>
-      <div
-        slot="footer"
-        class="dialog-footer"
-        v-if="rowObj.code == null || rowObj.code == ''"
-      >
+      <div slot="footer" class="dialog-footer" v-if="rowObj.code == null || rowObj.code == ''">
         <el-button @click="cancel">取消</el-button>
         <el-button type="primary" @click="submitTwo">保存</el-button>
       </div>
@@ -406,7 +270,7 @@ export default {
     //正则校验配件数量--维修数量
     numberIntegerValidator(rule, value, callback) {
       const reg = /^\+?[1-9][0-9]*$/;
-      if (value === '' || reg.test(value)) {
+      if (reg.test(value)) {
         callback();
       } else {
         callback(new Error('请输入大于0的正整数'));
@@ -499,7 +363,7 @@ export default {
     submit() {
       this.$refs["dynamicValidateForm"].validate(valid => {
         if (valid) {
-          this.dynamicValidateForm.premiumList.forEach(item=>{
+          this.dynamicValidateForm.premiumList.forEach(item => {
             item.partCost = item.partPrice;
           })
           // this.dynamicValidateForm.premiumList[0].partCost = this.dynamicValidateForm.premiumList[0].partPrice;
@@ -537,7 +401,7 @@ export default {
       this.$refs["dynamicValidateFormTwo"].validate(valid => {
         if (valid) {
           // this.dynamicValidateFormTwo.premiumListTwo[0].partCost = this.dynamicValidateFormTwo.premiumListTwo[0].partPrice;
-          this.dynamicValidateFormTwo.premiumListTwo.forEach(item=>{
+          this.dynamicValidateFormTwo.premiumListTwo.forEach(item => {
             item.partCost = item.partPrice;
           })
 
@@ -591,6 +455,7 @@ export default {
     width: 100%;
     border-bottom: 2px solid #1a1c22;
   }
+
   .form_box_item {
     width: 100%;
     display: flex;
@@ -622,6 +487,7 @@ export default {
     width: 100%;
     border-bottom: 2px solid #1a1c22;
   }
+
   .form_box_item {
     width: 100%;
     display: flex;

sgzb-ui/vue.config.js

@@ -15,7 +15,6 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
 
-
 module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
@@ -39,7 +38,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://112.29.103.165:21626`, //线上环境-重庆
         // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
-        target: `http://192.168.0.14:21624`, //测试环境
+        // target: `http://192.168.0.14:21624`, //测试环境
         // target: `http://1.12.248.179:23028`,//线上环境-南网
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
@@ -48,7 +47,7 @@ module.exports = {
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.153:8080`, //帅
-        // target: `http://10.40.92.14:28080`, //福
+        target: `http://10.40.92.5:28080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
@@ -149,10 +148,10 @@ module.exports = {
       })
 
       config.optimization.runtimeChunk('single'),
-      {
-        from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-        to: './', //到根目录下
-      }
+        {
+          from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+          to: './', //到根目录下
+        }
     })
   },
 }