前端代码修改，领料出库对接

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

@@ -227,8 +227,24 @@ export function getLeaseApplyAuditListAll(query) {
 }
 
 
-
+//领料出库 列表
-
+export function getLeaseAuditList(query) {
+  return request({
+    url: '/base/tm_task/getLeaseAuditList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+//领料出库 详情
+export function getLeaseAuditListDetail(query) {
+  return request({
+    url: '/base/tm_task/getLeaseAuditListDetail',
+    method: 'get',
+    params: query
+  })
+}
 
 
 

sgzb-ui/src/utils/dict/Dict.js

@@ -77,7 +77,7 @@ function loadDict(dict, dictMeta) {
       dicts.forEach(d => {
         Vue.set(dict.label[type], d.value, d.label)
       })
-      console.log(dict)
+      // console.log(dict)
       return dicts
     })
 }

sgzb-ui/src/utils/globalUrl.js

@@ -1,8 +1,8 @@
 
-// const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试
+const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试
-const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆
+// const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆
 // const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
-
+// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
 
 
 

sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue

@@ -1,10 +1,10 @@
 <template>
-    <div class="app-container" id="secondStore">
+    <div class="app-container" id="receiveOut">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item label="领料单号" prop="keyword">
+        <el-form-item label="领料单号" prop="code">
           <el-input
-            v-model="queryParams.keyword"
+            v-model="queryParams.code"
-            placeholder="请输入关键字"
+            placeholder="请输入领料单号"
             clearable
             style="width: 240px"
             @keyup.enter.native="handleQuery"
@@ -28,8 +28,8 @@
                 </el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="出库状态" prop="leaseStatus">
+        <el-form-item label="出库状态" prop="taskStatus">
-          <el-select v-model="queryParams.leaseStatus" placeholder="请选择出库状态"  clearable>
+          <el-select v-model="queryParams.taskStatus" placeholder="请选择出库状态"  clearable>
             <el-option
               v-for="item in statusList" filterable 
               :key="item.id" :label="item.name" :value="item.id" 
@@ -56,7 +56,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
   
-      <el-table v-loading="loading" :data="leaseList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="leaseList" >
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
@@ -98,104 +98,52 @@
         @pagination="getList"
       />
   
-        <!-- 出库弹窗 -->
+      <!-- 出库弹窗 -->
-      <el-dialog :title="title" :visible.sync="openOut" width="600px" append-to-body :close-on-click-modal="false">
+      <el-dialog :title="title" :visible.sync="openLeaseDevices" width="1200px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form :model="dialogQuery" ref="dialogQuery" size="small" :inline="true" label-width="100px">
-          <el-form-item label="类型名称:" prop="typeName">
+        <el-form-item label="设备负责人" prop="director">
-            <el-input v-model="form.typeName" placeholder="请输入类型名称" disabled/>
+          <el-input v-model="dialogQuery.director" maxlength="20"/>
-          </el-form-item>
-          <el-form-item label="规格型号" prop="modelName">
-            <el-input v-model="form.modelName" placeholder="请输入规格型号" disabled/>
-          </el-form-item>
-          <el-form-item label="在库数量" prop="zkNum">
-            <el-input v-model="form.zkNum" placeholder="请输入在库数量" disabled/>
-          </el-form-item>
-  
-          <el-form-item label="出库数量" prop="num">
-            <el-input v-model="form.num" placeholder="请输入出库数量" />
-          </el-form-item>
-          <el-form-item label="班组名称" prop="teamName">
-            <el-input v-model="form.teamName" placeholder="请输入班组名称" maxlength="50" />
-          </el-form-item>
-          <el-form-item label="领用人员" prop="leaseMan">
-            <el-input v-model="form.leaseMan" placeholder="请输入领用人员" maxlength="50" />
-          </el-form-item>
-          <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer" style="text-align: center">
-          <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-          <el-button @click="openOut=false">取 消</el-button>
-        </div>
-      </el-dialog>
-  
-      <!-- 进库弹窗 -->
-      <el-dialog :title="title" :visible.sync="openIn" width="600px" append-to-body :close-on-click-modal="false">
-        <el-form ref="nform" :model="nform" :rules="nrules" label-width="120px">
-          <el-form-item label="类型名称:" prop="typeName">
-            <el-input v-model="nform.typeName" placeholder="请输入类型名称" disabled/>
-          </el-form-item>
-          <el-form-item label="规格型号" prop="modelName">
-            <el-input v-model="nform.modelName" placeholder="请输入规格型号" disabled/>
-          </el-form-item>
-  
-          <el-form-item label="退库数量" prop="num">
-            <el-input v-model="nform.num" placeholder="请输入退库数量"/>
-          </el-form-item>
-          <el-form-item label="班组名称" prop="teamName">
-            <el-input v-model="nform.teamName" placeholder="请输入班组名称" maxlength="50" />
-          </el-form-item>
-          <el-form-item label="退库人员" prop="leaseMan">
-            <el-input v-model="nform.leaseMan" placeholder="请输入退库人员" maxlength="50" />
-          </el-form-item>
-          <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="nform.phone" placeholder="请输入联系电话" maxlength="11" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer" style="text-align: center">
-          <el-button type="primary" @click="submitForm(2)">确 定</el-button>
-          <el-button @click="openIn=false">取 消</el-button>
-        </div>
-      </el-dialog>
-  
-       <!-- 记录弹窗 -->
-       <el-dialog :title="title" :visible.sync="openRecord" width="1200px" append-to-body>
-        <el-form :model="dialogQuery" ref="dialogQuery" size="small" :inline="true" label-width="80px">
-        <el-form-item label="记录时间" prop="startTime">
-          <el-date-picker
-                v-model="dialogQuery.startTime"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="date"
-                placeholder="记录时间"
-            ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="类型名称" prop="typeName">
-          <el-input
-            v-model="dialogQuery.typeName"
-           disabled
-          />
-        </el-form-item>
-        <el-form-item label="规格型号" prop="modelName">
-          <el-input v-model="dialogQuery.modelName" disabled />
         </el-form-item>
+        <el-form-item label="机具类型" prop="typeId">
+          <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>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetDialogQuery">重置</el-button>
         </el-form-item>
       </el-form>
        
-      <el-table v-loading="loading" :data="dialogList">
+      <el-table v-loading="loading" :data="dialogList" height="600">
         <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="modelName" :show-overflow-tooltip="true" />
+        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-        <el-table-column label="数量" align="center" prop="num" :show-overflow-tooltip="true" />
+        <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
-        <el-table-column label="记录时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
+        <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
-        <el-table-column label="操作类型" align="center" prop="" :show-overflow-tooltip="true" />
+        <el-table-column label="设备负责人" align="center" prop="userName" :show-overflow-tooltip="true" />
-        
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!isView">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="codeOut(scope.row)"
+              v-if="scope.row.manageType==0"
+            >编码出库</el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              v-if="scope.row.manageType==1"
+              @click="numOut(scope.row)"
+            >数量出库</el-button>
+          </template>
+        </el-table-column>
         
       </el-table>
   
@@ -209,19 +157,100 @@
   
       </el-dialog>
       
+      <!-- 编码出库 -->
+      <el-dialog :title="title" :visible.sync="openCode" width="1200px" append-to-body>
+        <el-form :model="codeOutForm" ref="codeOutForm" size="small" :inline="true" label-width="100px">
+          <span style="margin-right: 50px;"> 
+            待出库数量：{{outNum}}
+          </span>
+          <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>
+        
+        </el-form>
+      
+        
+        <el-form :model="outQuery" ref="outQuery" size="small" :inline="true" label-width="100px">
+          <el-form-item label="设备编码" prop="maCode">
+            <el-input v-model="outQuery.maCode" maxlength="20"/>
+          </el-form-item>
+          
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleOutQuery">查询</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetOutQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+       
+      <el-table v-loading="loading" :data="outCodeList" height="500" @selection-change="handleSelectionChange">
+        <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" :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>
+  
+      <pagination
+        v-show="outTotal>0"
+        :total="outTotal"
+        :page.sync="outQuery.pageNum"
+        :limit.sync="outQuery.pageSize"
+        @pagination="getCodeList"
+      />
+  
+      </el-dialog>
+
+      <!-- 数量出库 -->
+      <el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body>
+        <el-form :model="numOutForm" ref="numOutForm" size="small" :inline="true" label-width="100px">
+          <!-- <span style="margin-right: 50px;"> 
+            待出库数量：{{outNum}}
+          </span> -->
+          <el-form-item label="请输入车牌号" prop="carCode">
+            <el-input v-model="numOutForm.carCode" maxlength="20"/>
+          </el-form-item>
+          <span style="margin-right: 50px;color: red;"> 
+            部分设备出库时，需进行装车,需记录车牌号码
+          </span>
+        
+        </el-form>
+       
+      <el-table v-loading="loading" :data="outCodeList" 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="typeModelName" :show-overflow-tooltip="true" />
+        <el-table-column label="库存数量" align="center" prop="" :show-overflow-tooltip="true" />
+        <el-table-column label="待出库数量" align="center" prop="outNum" :show-overflow-tooltip="true" />
+        <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" />
+        <el-table-column label="出库数量" align="center">
+        <template slot-scope="scope">
+          <el-input
+            v-model.number="scope.row.outNum"
+            placeholder="请输入出库数量"
+            type="number"
+            min="1" @input="checkNum(scope.row)"
+            clearable
+            style="width: 100%" 
+          />
+        </template>
+      </el-table-column>
+      </el-table>
+      </el-dialog>
     </div>
   </template>
   
   <script>
   import { operate,getRecords  } from "@/api/claimAndRefund/secondStore";
-  import { getUnitData,getProData,getLeaseAuditListAll } from "@/api/claimAndRefund/receive.js"
+  import { getUnitData,getProData,getLeaseAuditList,getLeaseAuditListDetail } 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";
   export default {
-    name: "SecondStore",
+    name: "receiveOut",
-    dicts: ['sys_normal_disable'],
     components: { Treeselect },
     data() {
       return {
@@ -241,11 +270,6 @@
         leaseList: [],
         // 弹出层标题
         title: "",
-        // 是否显示弹出层
-        openOut: false,
-        openIn: false,
-        // 日期范围
-        dateRange: [],
         // 单位数据
         unitList: [],
         proList:[], //工程集合
@@ -257,45 +281,45 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-         
+          flag:1,
+          code: undefined,
           unitId: undefined,
-          modelId: undefined,
+          proId: undefined,
-          typeId: undefined
+          taskStatus: undefined
         },
         // 表单参数 出库
         form: {},
-        // 表单校验
-        rules: {
-          num: [
-            { required: true, message: "出库数量不能为空", trigger: "blur" }
-          ],
-          teamName: [
-            { required: true, message: "班组名称不能为空", trigger: "blur" }
-          ]
-        },
-        // 表单参数 退库
-        nform:{},
-        nrules: {
-          num: [
-            { required: true, message: "退库数量不能为空", trigger: "blur" }
-          ],
-          teamName: [
-            { required: true, message: "班组名称不能为空", trigger: "blur" }
-          ]
-        },
         //记录弹窗
-        openRecord:false,
+        openLeaseDevices:false,
+        isView:false,
         dialogQuery: {
           pageNum: 1,
           pageSize: 10,
-          startTime: undefined,
+          director: undefined,
-          unitId: undefined,
-          modelId: undefined,
           typeId: undefined
         },
         dialogList:[],
-        queryType:1,
         dialogTotal: 0,
+
+        openCode:false,//编码弹窗开关
+        openNum:false,//数量弹窗开关
+        outNum:0,//待出库数量
+        codeOutForm:{//编码表单-车牌号
+          carCode: undefined,
+        },
+        numOutForm:{//数量表单-车牌号
+          carCode: undefined,
+        },
+        outQuery: {//编码出库-搜索条件
+          pageNum: 1,
+          pageSize: 20,
+          maCode: undefined,
+        },
+        outTotal: 0,//编码弹窗分页-总数
+        outCodeList:[],//编码弹窗表格数据
+        outNumParam:{},
+        outNumList:[],//数量弹窗表格数据
+       
       };
     },
     created() {
@@ -330,18 +354,16 @@
         equipmentTypeTree().then(response => {
           this.equipmentTypeList = response.data;
           this.equipmentTypeList.forEach((item,index)=>{
-            if(item.children.length>0){
+            if(item.children&&item.children.length>0){
               item.children.forEach((item2,index2)=>{
-                if(item2.children.length>0){
+                if(item2.children&&item2.children.length>0){
                   item2.children.forEach(item3=>{
-                    if(item3.children.length>0){
+                    if(item3.children&&item3.children.length>0){
                       item3.children.forEach(item4=>{ 
                         item4.machineTypeName = item3.typeName
                         item4.specificationType = item4.typeName
-                        // item4.purchasePrice = 1
+                        // this.$set(item4, 'purchasePrice', 0);
-                        // item4.purchaseNum = 1
+                        // this.$set(item4, 'purchaseNum', 1);
-                        this.$set(item4, 'purchasePrice', 0);
-                        this.$set(item4, 'purchaseNum', 1);
                       })
                     }
                   })
@@ -356,49 +378,99 @@
         this.queryParams.pageNum = 1;
         this.getList();
       },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
       /** 查询列表 */
       getList() {
         this.loading = true;
-        getLeaseAuditListAll(this.queryParams).then(response => {
+        getLeaseAuditList(this.queryParams).then(response => {
             this.leaseList = response.data.rows;
             this.total = response.data.total;
             this.loading = false;
           }
         );
       },
-      handleView(){
+      //查看按钮
-        
+      handleView(row){
+        this.openLeaseDevices = true;
+        this.isView = true;
+        this.dialogQuery.id = row.id;
+        this.resetDialogQuery()
+        // this.getDialogList();
       },
-      // 取消按钮
+      /** 查询列表 */
-      cancel() {
+      getDialogList() {
-        this.openOut = false;
+        console.log(this.dialogQuery)
-        this.openIn = false;
+        getLeaseAuditListDetail(this.dialogQuery).then(response => {
-        this.reset();
+            this.dialogList = response.data.rows;
+            this.dialogTotal = response.data.total;
+          }
+        );
       },
-      // 表单重置
-      reset() {
-        this.form = {
-         
-        };
-        this.resetForm("form");
-        this.nform = {
-       
-        };
-        this.resetForm("nform");
-      },
-      
       handleDialogQuery() {
         this.dialogQuery.pageNum = 1;
         this.getDialogList();
       },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
       resetDialogQuery() {
         this.resetForm("dialogQuery");
         this.handleDialogQuery();
+      },
+       /** 出库按钮操作 */
+       handleOut(row) {
+        this.openLeaseDevices = true;
+        this.isView = false;
+        this.dialogQuery.id = row.id;
+        this.resetDialogQuery()
+        this.getDialogList();
+      },
+      
+     
+      //编码出库
+      codeOut(row){
+        this.title='编码出库'
+        this.openCode=true;
+        this.outNum = row.outNum
+        this.handleOutQuery()
+      },
+      //数量出库
+      numOut(row){
+        this.title='数量出库'
+        this.openNum=true
+        this.outNumParam = {}
+        
+        this.getNumList()
+      },
+      handleOutQuery() {
+        this.outQuery.pageNum = 1;
+        this.getCodeList();
+      },
+      resetOutQuery() {
+        this.resetForm("outQuery");
+        this.handleOutQuery();
+      },
+      getCodeList() {
+
+        // getLeaseAuditListDetail(this.outQuery).then(response => {
+        //     this.outCodeList = response.data.rows;
+        //     this.outTotal = response.data.total;
+        //   }
+        // );
+      },
+
+      getNumList() {
+        // getLeaseAuditListDetail(this.outQuery).then(response => {
+        //     this.outNumList = response.data.rows;
+        //   }
+        // );
+      },
+      //输入出库数量
+      checkNum(row){
+        if(row.outNum<=1){
+          row.outNum = 1
+        }
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
@@ -406,84 +478,12 @@
         this.single = selection.length!=1
         this.multiple = !selection.length
       },    
-      /** 按钮操作 */
+     
-      handleOut(row) {//1
-        this.reset();
-        // this.form = row;
-        console.log(row)
-        this.$set(this.form,'unitId',row.unitId)
-        this.$set(this.form,'typeId',row.typeId)
-        this.$set(this.form,'unitName',row.unitName)
-        this.$set(this.form,'typeName',row.typeName)
-        this.$set(this.form,'modelName',row.modelName)
-        this.$set(this.form,'zkNum',row.zkNum)
-        console.log(this.form)
-        this.openOut = true;
-        this.title = "出库";
-      },
-      handleIn(row) {//2
-        this.reset();
-        // this.nform = row;
-        this.$set(this.nform,'unitId',row.unitId)
-        this.$set(this.nform,'typeId',row.typeId)
-        this.$set(this.nform,'unitName',row.unitName)
-        this.$set(this.nform,'typeName',row.typeName)
-        this.$set(this.nform,'modelName',row.modelName)
-        this.openIn = true;
-        this.title = "退库";
-      },
       /** 提交按钮 */
       submitForm: function(type) {
-        if(type==1){
+      
-          this.$refs["form"].validate(valid => {
-            if (valid) {
-              let param = {}
-              param = this.form
-              param.type=1
-              operate(param).then(response => {
-                this.$modal.msgSuccess("操作成功");
-                this.openOut = false;
-                this.getList();
-              });
-            }
-          });
-        }
-        if(type==2){
-          this.$refs["nform"].validate(valid => {
-            if (valid) {
-              let param = {}
-              param = this.nform
-              param.type=2
-              operate(param).then(response => {
-                this.$modal.msgSuccess("操作成功");
-                this.openIn = false;
-                this.getList();
-              });
-            }
-          });
-        }
       },
     
-      //查看记录
-      openRecords(row,type){
-        this.openRecord = true;
-        this.queryType = type
-        this.dialogQuery.typeName = row.typeName;
-        this.dialogQuery.modelName = row.modelName;
-        this.dialogQuery.unitId = row.unitId;
-        this.dialogQuery.typeId = row.typeId;
-        
-        this.getDialogList();
-      },
-      /** 查询列表 */
-      getDialogList() {
-        this.dialogQuery.queryType = this.queryType;
-        getRecords(this.dialogQuery).then(response => {
-            this.dialogList = response.rows;
-            this.dialogTotal = response.total;
-          }
-        );
-      },
       /** 导出按钮操作 */
       handleExport() {
         this.downloadJson('material/secondaryWarehouse/exportList',JSON.stringify(this.queryParams), `二级库_${new Date().getTime()}.xlsx`)

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

@@ -179,11 +179,11 @@ export default {
       equipmentTypeTree().then(response => {
         this.equipmentTypeList = response.data;
         this.equipmentTypeList.forEach((item,index)=>{
-          if(item.children.length>0){
+          if(item.children&&item.children.length>0){
             item.children.forEach((item2,index2)=>{
-              if(item2.children.length>0){
+              if(item2.children&&item2.children.length>0){
                 item2.children.forEach(item3=>{
-                  if(item3.children.length>0){
+                  if(item3.children&&item3.children.length>0){
                     item3.children.forEach(item4=>{ 
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName

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

@@ -177,11 +177,11 @@ export default {
       equipmentTypeTree().then(response => {
         this.equipmentTypeList = response.data;
         this.equipmentTypeList.forEach((item,index)=>{
-          if(item.children.length>0){
+          if(item.children&&item.children.length>0){
             item.children.forEach((item2,index2)=>{
-              if(item2.children.length>0){
+              if(item2.children&&item2.children.length>0){
                 item2.children.forEach(item3=>{
-                  if(item3.children.length>0){
+                  if(item3.children&&item3.children.length>0){
                     item3.children.forEach(item4=>{ 
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName

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

@@ -362,16 +362,14 @@ export default {
       equipmentTypeTree().then(response => {
         this.equipmentTypeList = response.data;
         this.equipmentTypeList.forEach((item,index)=>{
-          if(item.children.length>0){
+          if(item.children&&item.children.length>0){
             item.children.forEach((item2,index2)=>{
-              if(item2.children.length>0){
+              if(item2.children&&item2.children.length>0){
                 item2.children.forEach(item3=>{
-                  if(item3.children.length>0){
+                  if(item3.children&&item3.children.length>0){
                     item3.children.forEach(item4=>{
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName
-                      // item4.purchasePrice = 1
-                      // item4.purchaseNum = 1
                       this.$set(item4, 'purchasePrice', 0);
                       this.$set(item4, 'purchaseNum', 1);
                     })

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue

@@ -373,14 +373,10 @@ export default {
             item.children.forEach((item2,index2)=>{
               if(item2.children&&item2.children.length>0){
                 item2.children.forEach(item3=>{
-                  // console.log(item3,'item3')
                   if(item3.children&&item3.children.length>0){
                     item3.children.forEach(item4=>{ 
-                      // console.log(item4,'item4')
                       item4.machineTypeName = item3.typeName
                       item4.specificationType = item4.typeName
-                      // item4.purchasePrice = 1
-                      // item4.purchaseNum = 1
                       this.$set(item4, 'purchasePrice', 0);
                       this.$set(item4, 'purchaseNum', 1);
                     })

sgzb-ui/vue.config.js

@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",///gl/
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -40,9 +40,9 @@ module.exports = {
         // 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`,
+        // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://10.40.92.8:8080`,//超
+        target: `http://10.40.92.8:8080`,//超
         // target: `http://10.40.92.253:8080`,//韩
         // target: `http://10.40.92.209:8080`,//川/
 
@@ -52,7 +52,8 @@ module.exports = {
         //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址，打开大屏项目config/index.js更改请求地址，大屏打包node<16.0.0;
         //3.只有南网项目产线gl发布打包时候需要注意：
         //  将 publicPath:'static' 改为 '/gl/',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';
-        //  登录跳转地址从/login换成/gl/login;
+        //  router/indx.js 中base放开
+        //  登录跳转地址从/login换成/gl/login 3处;
         //4. 重庆环境的时候需要将领料管理线上菜单修改
         //******** 注意事项  ********* */