Merge remote-tracking branch 'origin/master'

zss

2023-12-19 7af57170702277127862dd2c791ea72eaf9a086e

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/basic/staff/staff-form.vue

 src/const/crud/customerOrder/customerOrderForm.js

@@ -39,30 +39,6 @@
    minWidth: 200,
    span: 24
  }, {
    label: '零件规格',
    prop: 'customerPartSpec',
    type: 'input',
    cell: true,
    minWidth: 200,
    span: 24
  }, {
    label: '制造属性',
    prop: 'manufactureAttr',
    cell: true,
    type: 'select',
    minWidth: 200,
    span: 24,
    dicData:[{
        label: '普通',
        value: 'N'
    },{
        label: '样品',
        value: 'S'
    },{
        label: '研发',
        value: 'D'
    }]
  }, {
    label: '产品名称',
    prop: 'productName',
    cell: true,
@@ -70,13 +46,13 @@
    minWidth: 200,
    span: 24
  }, {
    label: '隶属品牌',
    prop: 'productType',
    cell: true,
    label: '规格型号',
    prop: 'customerPartSpec',
    type: 'input',
    cell: true,
    minWidth: 200,
    span: 24
  }, {
  },  {
    label: '单位',
    prop: 'otcUnit',
    slot: true,
@@ -95,6 +71,30 @@
    span: 24,
    rules:[{required:true,message:'类型必须是数字',trigger:'blur'}]
  }, {
    label: '制造属性',
    prop: 'manufactureAttr',
    cell: true,
    type: 'select',
    minWidth: 200,
    span: 24,
    dicData:[{
        label: '普通',
        value: 'N'
    },{
        label: '样品',
        value: 'S'
    },{
        label: '研发',
        value: 'D'
    }]
  }, {
    label: '隶属品牌',
    prop: 'productType',
    cell: true,
    type: 'input',
    minWidth: 200,
    span: 24
  },{
    label: '收货地址',
    prop: 'shippingAddress',
    cell: true,

 src/views/basic/company/company-form.vue

@@ -377,6 +377,7 @@
                this.$emit('refreshDataList')
              })
            }
            this.isSubmit = false
          } else {
            this.isSubmit = false
          }

 src/views/basic/crew/crew-form.vue

@@ -90,6 +90,7 @@
              this.$emit('refreshDataList')
            })
          }
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/division/division-form.vue

@@ -179,6 +179,7 @@
            }
            this.isSubmit = false
          })
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/factory/factory-form.vue

@@ -171,6 +171,7 @@
            }
            this.isSubmit = false
          })
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/post/post-form.vue

@@ -101,6 +101,7 @@
              this.$emit('refreshDataList')
            })
          }
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/shift/shift-form.vue

@@ -366,6 +366,7 @@
              this.$emit('refreshDataList')
            })
          }
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/staff/staff-form.vue

@@ -248,10 +248,7 @@
            }
            this.isSubmit = false
          })
          .catch((error) => {
                    this.isSubmit = false
                    console.log(error)
          })
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/plan/manufacturingorder/index.vue

@@ -210,7 +210,7 @@
          <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
            <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
                  <el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
                  <el-row>
                  <!-- <el-row>
                    <el-col :span="10" :offset="3">批次号</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
                  </el-row>
@@ -231,7 +231,28 @@
                    <el-col :span="10">
                      <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
                    </el-col>
                  </el-row>
                  </el-row> -->
                   <div style="display: flex;">
                      <div>
                        <el-col :span="8" :offset="2">
                          <vueQr :text="JSON.stringify(item.code)" :size="120" :margin="2"></vueQr>
                        </el-col>
                      </div>
                      <div style="margin-left: 20px;width: 100%;">
                        <el-row >
                          <el-col  style="font-weight: bold;"><span>批次号:&nbsp; </span>{{ item.code.moNo2 }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;"><span>订单号:&nbsp; </span>{{ item.orderNo }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;"><span>客户名称:&nbsp; </span>{{ item.cName }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 5px;">
                          <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
                        </el-row>
                      </div>
                  </div>
            </el-card>
          </el-checkbox-group>
        </div>
@@ -241,9 +262,9 @@
        <el-button type="primary" @click="printFun">打 印</el-button>
      </span>
    </el-dialog>
    <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;padding: 0;">
    <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="padding-top:0px;margin-bottom:10px;font-size: 16px !important;">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 16px !important;">
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">批次号</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>

 src/views/plan/productionschedul/index.vue

@@ -165,6 +165,10 @@
        pagerCount: 5
      },
      option: {
        defaultSort:{
          prop:'id',
          order:'descending'
        },
        height: 400,
        selection: true,
        columnBtn: false,
@@ -305,11 +309,11 @@
    this.loading = true
    this.getData()
    this.getParamType()
    this.rowSort()
    // this.rowSort()
    this.rowCalc()
  },
  beforeUpdate() {
    this.rowSort()
    // this.rowSort()
    this.rowCalc()
  },
  watch:{
@@ -513,7 +517,7 @@
        ele.span = this.rowSpan(ele.prop, parent)
      })
    },
    rowSort(list) {
    rowSort() {
      let propList = this.spanArr.map(ele => ele.prop)
      this.spanArr.forEach((ele, index) => {
        let key = ele.prop

 vue.config.js

@@ -6,11 +6,13 @@

// const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.2.7:9999'
const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'

const url = 'http://localhost:9999'
// const url = 'http://localhost:9999'


const localUrl = 'http://localhost:8089'