Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/BasicSettings/Setting.vue

@@ -1,5 +1,5 @@
 <template>
-<div>
+<div style="overflow:auto">
       <Toptitle title="项目设置">
       </Toptitle>
      <div style="padding: 10px" class="setting" >

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -25,6 +25,21 @@
           style="margin-right: 10px"
           >{{ type == 3 ? "变更完成" : "保存" }}</Button
         >
+          <Upload
+          style="display: inline"
+          v-if="type!=2"
+          name="your_file"
+          :show-upload-list="false"
+          :headers="headers"
+          :on-error="uploadError"
+          :data='$route.query'
+          :on-success="uploadSuccess"
+          :action="$store.state.ip + '/api/explode_import_new'"
+        >
+          <Button type="primary" style="margin-right: 10px"
+            >导入</Button
+          >
+        </Upload>
       </slot>
     </Toptitle>
     <div class="top_info">
@@ -1037,6 +1052,7 @@ export default {
   data() {
     // 这里存放数据
     return {
+      headers: { Authorization: localStorage.getItem("token") },
       modal_show:false,
       // 1拆单 2详情
       type: this.$route.query.type,
@@ -1455,6 +1471,7 @@ export default {
   },
   // 生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
+    
     // 获取产品分类列表
     this.axios("/api/parts_product_list").then((res) => {
       this.PDTTypeList = res.data;
@@ -1490,6 +1507,24 @@ export default {
     );
   },
   methods: {
+     uploadError(err) {
+      this.$Message.error(err.msg || "导入失败");
+    },
+     uploadSuccess(res) {
+      if (res.code == 200) {
+        this.$Message.success(res.msg || "导入成功");
+        // const temp = res.data;
+        // let list = [...this.postInfo.children, ...temp];
+         this.initData(
+      this.order_no,
+      this.orders_area_product_detail_id,
+      this.oa_id
+    );
+
+      } else {
+        this.$Message.warning(res.msg || "导入失败");
+      }
+    },
     initData(order_no, orders_area_product_detail_id, oa_id) {
       this.axios({
         method: "get",

src/views/Dispatching/Dispatching.vue

@@ -265,6 +265,7 @@ export default {
       dispatchInfo: {},
       subArr: [],
       subUrl: "",
+      show_type:true
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -511,11 +512,22 @@ export default {
 
   handleDispatchConfirm() {
     if (this.wood_select.length!=0||this.paint_select.length!=0||this.packing_select.length!=0||this.transit_select.length!=0||this.install_select.length!=0) {
-        this.showModal = true;
-        this.subArr =[...this.wood_select,...this.paint_select,...this.packing_select,...this.transit_select,...this.install_select]
+      this.show_type = true;
+        this.subArr =[...this.wood_select,...this.paint_select,...this.packing_select,...this.transit_select,...this.install_select];
+        console.log(this.subArr);
         this.subUrl = "/api/order_produce_pull_all";
+       try{this.subArr.forEach(v=>{
+          if(!v.employee_id){
+            this.show_type = false;
+            throw new Error();
+          }
+        })} catch(e){
+          
+          this.$Message.warning('请设置班组');
+        };
+        this.showModal = this.show_type;
       } else {
-        this.$Message.warning("请选择班组");
+        this.$Message.warning("请选择工序");
       }
     },
     handleDispatch(target, url) {

src/views/ProcedureMannage/index.vue

@@ -121,11 +121,11 @@ export default {
           resizable:true,
           width: 150,
         },
-        { title: "工序类型", align: "center", key: "p_title",  resizable:true,width: 250 },
-        { title: "工序名称", align: "center", key: "title",  resizable:true,width: 250 },
-        { title: "工时", align: "center", key: "time",  resizable:true,width: 250 },
-        { title: "工价", align: "center", key: "wages",  resizable:true,width: 250 },
-        { title: "产能", align: "center", key: "capacity",  resizable:true,width: 250 },
+        { title: "工序类型", align: "center", key: "p_title",  resizable:true,width: 240 },
+        { title: "工序名称", align: "center", key: "title",  resizable:true,width: 240 },
+        { title: "工时", align: "center", key: "time",  resizable:true,width: 240 },
+        { title: "工价", align: "center", key: "wages",  resizable:true,width: 240 },
+        { title: "产能", align: "center", key: "capacity",  resizable:true,width: 240 },
         {
           title: "操作",
           align: "center",

src/views/ProductMannage/index.vue

@@ -264,18 +264,18 @@ export default {
           align: "center",
           key: "",
            resizable: true,
-          width: 100,
+          width: 70,
         },
-        { title: "分类名称", align: "center", key: "type_name", resizable: true,width:200 },
-        { title: "产品名称", align: "center", key: "title" , resizable: true,width:200},
-        { title: "计量单位", align: "center", key: "unit" , resizable: true,width:200},
-        { title: "型号", align: "center", key: "model", resizable: true,width:200 },
-        { title: "图号", align: "center", key: "url_number", resizable: true,width:200 },
+        { title: "分类名称", align: "center", key: "type_name", resizable: true,width:190 },
+        { title: "产品名称", align: "center", key: "title" , resizable: true,width:190},
+        { title: "计量单位", align: "center", key: "unit" , resizable: true,width:190},
+        { title: "型号", align: "center", key: "model", resizable: true,width:190 },
+        { title: "图号", align: "center", key: "url_number", resizable: true,width:190 },
         {
           title: "产品图片",
           align: "center",
           key: "company",
-           resizable: true,width:200,
+           resizable: true,width:190,
           render: (h, params) => {
             const { row } = params;
             return h("img", {
@@ -332,7 +332,7 @@ export default {
           title: "图纸",
           align: "center",
           key: "url",
-         resizable: true,width:200,
+         resizable: true,width:190,
           render: (h, params) => {
             const { row } = params;
             return h("img", {

src/views/ProductionOrderList/Deliverylist/DeliveryDetail.vue

@@ -79,11 +79,13 @@
         <a
           class="map-margin"
           @click="outShip([row.orders_procedure_id], 1)"
-          >{{ row.transport_no != 1 ? "发货完成" : "" }}</a
+          v-show="row.in_out_value==0"
+          > 发货完成 </a
         ><a
           class="map-margin"
-          @click="outShip([row.orders_procedure_id], 2)"
-          >{{ row.transport_no != 1 ? "收货完成" : "" }}</a
+          v-show='row.transportation_value==0&&row.in_out_value==1'
+          @click="row.in_out_value == 1?outShip([row.orders_procedure_id], 2):$Message.warning('请先确认发货')"
+          >收货完成</a
         >
       </template>
       <Modal
@@ -203,11 +205,11 @@ export default {
          {
             title: "发货状态",
             name: "Select",
-            serverName: "transportation_value",
+            serverName: "in_out_value",
             value: "",
             option: [
-              { label: "已确认", value: 1 },
-              { label: "未确认", value: 0 },
+              { label: "已发货", value: 1 },
+              { label: "未发货", value: 0 },
             ],
           },
            {
@@ -261,9 +263,9 @@ export default {
             h(
               "span",
               {},
-              params.row.sub_state == 0
-                ? "未确认"
-                : '已确认'
+              params.row.in_out_value == 0
+                ? "未发货"
+                : '已发货'
             ),
         },
          {
@@ -275,8 +277,8 @@ export default {
             h(
               "span",
               {},
-              params.row.sub_state == 0
-                ? "未收获"
+              params.row.transportation_value == 0
+                ? "未收货"
                 : '已收货'
             ),
         },
@@ -423,9 +425,11 @@ export default {
       if (!this.selectedReturnArr || this.selectedReturnArr.length < 1) {
         return this.$Message.error("请至少选择一项");
       }
-      params = this.selectedReturnArr.map((v) => {
-        return v.chip;
-      });
+      // params = this.selectedReturnArr.map((v) => {
+      //   return v.chip;
+      // });
+      // console.log(this.selectedReturnArr)
+      // console.log(row)
       this.$Modal.confirm({
         title: "确认退回？",
         content: "此操作无法恢复，请确认！",
@@ -434,7 +438,7 @@ export default {
             method: "post",
             url: "/api/transport_callback",
             data: {
-              tag: params,
+              tag: row,//params
             },
           }).then((res) => {
             if (res.code == 200) {

src/views/ProductionOrderList/Deliverylist/Deliverylist.vue

@@ -41,14 +41,14 @@
           @click="confirmOutStock(row, 1)"
           v-if="row.state == 0"
           class="map-margin"
-          >发货</a
+          >发货完成</a
         >
         <!-- &&(persimissionData['确认出库'] || persimissionData.all) -->
         <a
           @click="confirmOutStock(row, 2)"
           v-if="row.state == 1"
           class="map-margin"
-          >确认运输</a
+          >收货完成</a
         >
         <!-- &&(persimissionData['确认运输'] || persimissionData.all) -->
         <a
@@ -393,14 +393,14 @@ export default {
       this.getData(this.proxyObj);
     },
     confirmOutStock(row, type) {
-      //type 1出库  2运输
+      //type 1发货完成  2收货完成
       let params = {};
       let post_url =
         type == 1 ? "/api/orders_transport" : "/api/orders_transport_confirm";
       params.transport_no = row.transport_no || row.order_no;
       this.confirmDelete({
-        title: type == 1 ? "确认出库" : "确认运输",
-        content: type == 1 ? "确认出库么？" : "确认运输么？",
+        title: type == 1 ? "确认发货" : "确认收货",
+        content: type == 1 ? "确认发货么？" : "确认收货么？",
         type: "primary",
         then: (e) => {
           this.axios.post(post_url, params).then((res) => {

src/views/ProductionOrderList/Dispatchlist/confirm.vue

@@ -35,6 +35,25 @@
         </div>
       </template>
     </FullPage>
+      <Modal
+       title="设置班组"
+        v-model="finish_modal"
+        width="400"
+      
+        @on-ok="finish_Ok">
+        <Form>
+          <FormItem label="完成班组:">
+              <Select v-model="finish_nickname" style="width:180px">
+                <Option
+                  :value="item.id"
+                  v-for="(item, index) in nickname_users"
+                  :key="index"
+                  >{{ item.nickname }}</Option
+                >
+              </Select>
+            </FormItem>
+        </Form>
+      </Modal>
   </div>
 </template>
 
@@ -42,6 +61,8 @@
 export default {
   data() {
     return {
+      finish_nickname:'',
+      finish_modal:false,
       type: 1,
       logList: [{ title: "系统单号", value: "10998765" }],
       tableColums: [
@@ -119,13 +140,15 @@ export default {
       url_number_list: [], 
       part_label: [],
       produce_type_list: [],
+      nickname_users:[],
+      params_data:[]
     };
   },
   created() {
     // this.axios("/api/procedure_index").then(
     //   (res) => (this.produces = res.data.data)
     // );
-    // this.axios("/api/employee_list").then((res) => (this.users = res.data));
+    this.axios("/api/employee_list").then((res) => (this.nickname_users = res.data));
   },
   computed: {
     list() {
@@ -196,6 +219,14 @@ export default {
     },
   },
   methods: {
+    finish_Ok(){
+      if(!this.finish_nickname){
+         this.$Message.warning('请选择班组')
+       
+      }else{
+               this.postData({...this.params_data,team_id:this.finish_nickname},1)
+      }
+    },
     search(row){
            row.start_time = row.start_time?new Date(row.start_time).getTime().toString().split('').splice(0,10).join(''):'';
       row.end_time =row.end_time? new Date(row.end_time).getTime().toString().split('').splice(0,10).join(''):'';
@@ -279,15 +310,8 @@ export default {
             )
           : row.produce_time,
       };
-      this.confirmDelete({
-        content: "是否手动操作此订单生产完成",
-        title: "生产完成",
-        type: "primary",
-        then: () => {
-          this.postData(params, type);
-        },
-        cancel: () => {},
-      });
+     this.finish_modal = true;
+     this.params_data = params;
     },
     selectTable(e) {
       this.selectIds = e;

src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -40,7 +40,7 @@
           ghost
           >批量返工</Button
         >
-        <Button @click="finish(selectIds, 1)" type="success" ghost
+        <Button @click="finish(selectIds)" type="success" ghost
           >批量完成</Button
         >
       </div>
@@ -51,7 +51,7 @@
             v-if="row.sub_state < 3"
             class="map-margin"
             style="color:#32C800"
-            @click="finish(row, 1)"
+            @click="finish(row)"
             >完成</a
           >
           <a
@@ -161,6 +161,25 @@
             </FormItem> -->
         </Form>
       </Modal>
+      <Modal
+       title="设置班组"
+        v-model="finish_modal"
+        width="400"
+      
+        @on-ok="finish_Ok">
+        <Form>
+          <FormItem label="完成班组:">
+              <Select v-model="finish_nickname" style="width:180px">
+                <Option
+                  :value="item.id"
+                  v-for="(item, index) in username_list"
+                  :key="index"
+                  >{{ item.nickname }}</Option
+                >
+              </Select>
+            </FormItem>
+        </Form>
+      </Modal>
     </div>
   </div>
 </template>
@@ -169,6 +188,9 @@
 export default {
   data() {
     return {
+      select_nickname:'',
+      finish_modal:false,
+      finish_nickname:'',
       formData:{
            house:'',
            unit:'',
@@ -242,7 +264,8 @@ export default {
           minWidth: 150,
           key: "procedure_title",
         },
-        { title: "班组", align: "center", minWidth: 150, key: "nickname" },
+        { title: "派工班组", align: "center", minWidth: 150, key: "nickname" },
+        { title: "完工班组", align: "center", minWidth: 150, key: "finish_nickname" },
         { title: "测量尺寸", align: "center", minWidth: 150, key: "measure" },
         { title: "单位", align: "center", minWidth: 100, key: "company" },
         { title: "芯片编号", align: "center", minWidth: 150, key: "chip" },
@@ -459,6 +482,14 @@ export default {
     });
   },
   methods: {
+    finish_Ok(){
+      if(!this.finish_nickname){
+        this.$Message.warning('请选择班组')
+      }else{
+           this.postData({id:this.select_nickname,...this.$route.query,team_id:this.finish_nickname},1)
+      }
+       
+    },
     download(){
       this.axios.get('/api/nc_export').then(res=>{
            if (res.code == 200) {
@@ -581,6 +612,7 @@ export default {
           //若没有选择产品
           if (row.length == 0) {
             this.$Message.warning("请选择产品!");
+            this.modal8 = false;
           } else {
             this.form_modal.procedure_title = [];
             //选择了请求班组数据
@@ -641,23 +673,18 @@ export default {
            let data = {};
       data = {...this.formData,...this.$route.query};
           this.getData(data);
+          this.selectIds = [];
         }
       });
     },
-    finish(row, type) {
+    finish(row) {
       if (!row || row.length < 1) {
         return this.$Message.warning("请至少选择一项");
       }
       let str = Array.isArray(row) ? row.join(",") : row.id;
-      this.confirmDelete({
-        content: type == 1 ? "是否手动操作此订单生产完成" : "确认驳回？",
-        title: type == 1 ? "生产完成" : "驳回",
-        type: type == 1 ? "primary" : "error",
-        then: () => {
-          this.postData({ id: str }, type);
-        },
-        cancel: () => {},
-      });
+      this.select_nickname = str;
+      console.log(this.select_nickname)
+     this.finish_modal = true;
     },
     selectTable(e) {
       let result = [];

src/views/ProductionOrderList/InboundForm/details.vue

@@ -95,14 +95,15 @@
         > -->
         <a
           class="map-margin"
-          v-if="row.in_out_value !== 1"
+          v-show="!row.order_in_no"
           @click="outShip(row, 3)"
-          >{{row.order_in_no?'':'包装完成'}}</a
+          >包装完成</a
         >
         <a
           class="map-margin"
-          @click="row.order_in_no ? outDelivery(row) : ''"
-          >{{ row.in_out_value != 1 ? "发货指令" : "" }}</a
+          v-show="row.in_out_value == 0 && row.order_in_no"
+          @click="row.order_in_no ? outDelivery(row) : $Message.warning('请先确认包装')">
+          发货指令</a
         >
       </template>
       <Modal
@@ -221,27 +222,27 @@ export default {
           option: [],
         },
         {
-          title: "入库状态",
+          title: "包装完成状态",
           name: "Select",
           serverName: "sub_state",
-          placeholder: "入库状态",
+          placeholder: "包装状态",
           value: "",
           option: [
             // { label: "未指派", value: 0 },
             // { label: "可以派工", value: 1 },
-            { label: "未入库", value: 2 },
-            { label: "已入库", value: 3 },
+            { label: "未包装完成", value: 2 },
+            { label: "已包装完成", value: 3 },
           ],
         },
         {
-          title: "出库状态",
+          title: "发货指令状态",
           name: "Select",
           serverName: "in_out_value",
-          placeholder: "出库状态",
+          placeholder: "发货指令状态",
           value: "",
           option: [
-            { label: "已出库", value: 1 },
-            { label: "未出库", value: 0 },
+            { label: "已下指令", value: 1 },
+            { label: "未下指令", value: 0 },
           ],
         },
       ],
@@ -290,7 +291,7 @@ export default {
             },
         { title: "单位", align: "center", minWidth: 100, key: "company" },
         {
-          title: "状态",
+          title: "包装完成状态",
           align: "center",
           minWidth: 200,
           key: "",
@@ -298,17 +299,13 @@ export default {
             h(
               "span",
               {},
-              params.row.sub_state == 0
-                ? "未指派"
-                : params.row.sub_state == 1
-                ? "可以派工"
-                : params.row.sub_state == 2
-                ? "已派工"
-                : "已完成"
+              params.row.sub_state == 2
+                ? "未包装完成"
+                : '已包装完成'
             ),
         },
         {
-          title: this.$route.query.type == 2 ? "确认出库状态" : "出库状态",
+          title: this.$route.query.type == 2 ? "确认出库状态" : "发货指令状态",
           align: "center",
           minWidth: 200,
           render: (h, params) =>
@@ -317,10 +314,10 @@ export default {
               params.row.in_out_value == 1
                 ? this.$route.query.type == 2
                   ? "已确认"
-                  : "已出库"
+                  : "已下指令"
                 : this.$route.query.type == 2
                 ? "未确认"
-                : "未出库"
+                : "未下指令"
             ),
         },
         { title: "芯片编号", align: "center", minWidth: 200, key: "chip" },

src/views/ProductionOrderList/ProductionPlanlist/details.vue

@@ -25,14 +25,14 @@
           ghost
           >打印清单</Button
         >
-        <Button type="primary" ghost @click="batchDispatchOrder"
+        <!-- <Button type="primary" ghost @click="batchDispatchOrder"
           >批量派工单</Button
-        >
+        > -->
       </div>
 
       <template slot="set" slot-scope="{ row }">
         <div>
-          <a v-if="row.label == 1" style="margi n:0 5px" @click="bingChip(row)"
+          <a v-if="row.label == 1" style="margin:0 5px" @click="bingChip(row)"
             >更改芯片</a
           >
         </div>

src/views/ProductionOrderList/workOver/confirm.vue

@@ -29,6 +29,25 @@
                 </div>
             </template>
         </FullPage>
+         <Modal
+       title="设置班组"
+        v-model="finish_modal"
+        width="400"
+      
+        @on-ok="finish_Ok">
+        <Form>
+          <FormItem label="完成班组:">
+              <Select v-model="finish_nickname" style="width:180px">
+                <Option
+                  :value="item.id"
+                  v-for="(item, index) in username_list"
+                  :key="index"
+                  >{{ item.nickname }}</Option
+                >
+              </Select>
+            </FormItem>
+        </Form>
+      </Modal>
     </div>
 </template>
 
@@ -36,6 +55,10 @@
 export default {
     data(){
         return {
+          finish_nickname:'',
+          finish_modal:false,
+          username_list:[],
+          select_id:'',
             form_modal:{
                 nickname:[],
                 user_id:'',
@@ -65,7 +88,8 @@ export default {
                 // {title:'贴标签零部件',align:'center',minWidth:150,key:'sub_part'},
                 {title:'工序分类',align:'center',minWidth:150,key:'basic_title'},
                 {title:'工序',align:'center',minWidth:150,key:'procedure_title'},
-                {title:'班组',align:'center',minWidth:150,key:'nickname'},
+                {title:'返工班组',align:'center',minWidth:150,key:'nickname'},
+                {title:'完工班组',align:'center',minWidth:150,key:'finish_nickname'},
                 {title:'测量尺寸',align:'center',minWidth:150,key:'measure'},
                 {title:'单位',align:'center',minWidth:100,key:'company'},
                 {title:'芯片编号',align:'center',minWidth:150,key:'chip'},
@@ -218,9 +242,19 @@ export default {
     },
     },
     mounted(){
-        this.getData(this.$route.query)
+        this.getData(this.$route.query);
+        this.axios("/api/employee_list").then((res) => {
+      this.username_list = res.data;
+    });
     },
     methods:{
+      finish_Ok(){
+  if(!this.finish_nickname){
+        this.$Message.warning('请选择班组')
+      }else{
+           this.postData({id:this.select_id,...this.$route.query,team_id:this.finish_nickname},1)
+      }
+      },
       search(row){
         console.log(row)
              row.page_size = this.pageSize
@@ -324,23 +358,17 @@ export default {
             this.axios.post(url,data).then(res=>{
                 if(res.code == 200){
                     this.$Message.success(res.msg);
-                    this.getData(this.$route.query)
+                    this.getData(this.$route.query);
+                    this.selectIds = [];
                 }
             })
         },
         finish(row,type){
-            if(!row||row.length<1){return this.$Message.warning('请至少选择一项')}
+            if(!row||row.length<1){return this.$Message.warning('请至少选择一项')};
+            this.finish_nickname = '';
             let str = Array.isArray(row) ? row.join(',') : row.id
-            this.confirmDelete({
-                content:type == 1 ? '是否手动操作此订单生产完成' : '确认驳回？',
-                title:type == 1 ? '生产完成' : '驳回',
-                type:type == 1 ? 'primary' : 'error',
-                then:()=>{
-                    this.postData({id:str},type)
-                    
-                },
-                cancel:()=>{}
-            })
+           this.select_id = str;
+           this.finish_modal = true;
         },
         selectTable(e){
            

src/views/ProductionOrderList/workOver/details.vue

@@ -37,6 +37,25 @@
         </div>
       </template>
     </FullPage>
+     <Modal
+       title="设置班组"
+        v-model="finish_modal"
+        width="400"
+      
+        @on-ok="finish_Ok">
+        <Form>
+          <FormItem label="完成班组:">
+              <Select v-model="finish_nickname" style="width:180px">
+                <Option
+                  :value="item.id"
+                  v-for="(item, index) in username_list"
+                  :key="index"
+                  >{{ item.nickname }}</Option
+                >
+              </Select>
+            </FormItem>
+        </Form>
+      </Modal>
   </div>
 </template>
 
@@ -44,6 +63,10 @@
 export default {
   data() {
     return {
+      finish_modal:false,
+      finish_nickname:'',
+      username_list:[],
+      finish_data:{},
       type: 1,
       logList: [{ title: "系统单号", value: "10998765" }],
       tableColums: [
@@ -137,7 +160,7 @@ export default {
     //   (res) => {
     //     this.unit_list = res.data.data}
     // );
-    // this.axios("/api/employee_list").then((res) => (this.level_list = res.data));
+    this.axios("/api/employee_list").then((res) => (this.username_list = res.data));
   },
   computed: {
     list() {
@@ -197,6 +220,14 @@ export default {
     },
   },
   methods: {
+     finish_Ok(){
+      if(!this.finish_nickname){
+        this.$Message.warning('请选择班组')
+      }else{
+           this.postData({...this.finish_data,team_id:this.finish_nickname},1)
+      }
+       
+    },
     search(row){
       console.log(row)
        row.start_time = row.start_time?new Date(row.start_time).getTime().toString().split('').splice(0,10).join(''):'';
@@ -327,15 +358,8 @@ export default {
             )
           : row.produce_time,
       };
-      this.confirmDelete({
-        content: "是否手动操作此订单生产完成",
-        title: "生产完成",
-        type: "primary",
-        then: () => {
-          this.postData(params, type);
-        },
-        cancel: () => {},
-      });
+     this.finish_modal = true;
+     this.finish_data = params;
     },
     selectTable(e) {
       this.selectIds = e;

src/views/ProductionOrderList/workOver/list.vue

@@ -197,6 +197,7 @@ export default {
     init (row) {
       row.page_index = this.page_index;
       row.page_size = this.page_size;
+      console.log(1)
       if (this.firstEnter == 1) {
         this.corssPageData = JSON.parse(localStorage.getItem('corssPageData'))
         row = this.corssPageData

src/views/leadMatch/MatchList/matchPage.vue

@@ -824,7 +824,7 @@ export default {
           align: "center",
           minWidth: 80,
           render: (h, params) => {
-            return h("span", {}, params.row.board1 + ";" + params.row.board2);
+            return h("span", {}, params.row.board1 + (params.row.board2?(';'+params.row.board2):''));
           },
         },
         { title: "木皮2", align: "center", key: "skin2", minWidth: 60 },
@@ -875,7 +875,7 @@ export default {
           align: "center",
           minWidth: 100,
           render: (h, params) => {
-            return h("span", {}, params.row.board1 + ";" + params.row.board2);
+            return h("span", {}, params.row.board1 + (params.row.board2?(';'+params.row.board2):''));
           },
         },
         { title: "木皮2", align: "center", key: "skin2", minWidth: 100 },