Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-09-19 9b52218c49caaf38fa986516eae04c0e2acda7b4

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue

@@ -128,30 +128,7 @@


const TgaStyleSet = ref([
  {
    tid: '此面为室外面', title: '此面为室外面', data: '', type: 'text',
    options: {
      field: '',
      testData: '',
      height: 16,
      fontSize: 6.75,
      fontWeight: "700",
      textAlign: "left",
      textContentVerticalAlign: "middle"
    }
  },
  {
    tid: '此面为室内面', title: '此面为室内面', data: '', type: 'text',
    options: {
      field: '',
      testData: '',
      height: 16,
      fontSize: 6.75,
      fontWeight: "700",
      textAlign: "left",
      textContentVerticalAlign: "middle"
    }
  },

  {
    tid: 'orderId', title: '订单号', data: '', type: 'text',
    options: {
@@ -632,7 +609,7 @@
  <div style="height: 100%;width: 100%">
    <div style="height: 10%;width: 100%;float: left" @change="changePaperSize">
      <el-row>
        <el-col :span="5" >
        <el-col :span="6" >
          <el-button-group  >
            <el-button  v-for="(item,key) in paperTypes"  @click="changePaperSize(item,'list')"  >{{key}}</el-button>
            <el-popover placement="right" :width="250" trigger="click">
@@ -655,7 +632,7 @@
            </el-popover>
          </el-button-group>
        </el-col>
        <el-col :span="5">
        <el-col :span="6">
            <el-select v-model="tag" @change="changeTag" placeholder="标签模板列表" style="width: 140px" >
              <el-option
                  v-for="(tag,index) in tags"
@@ -674,7 +651,7 @@
            />
          </el-select>
        </el-col>
        <el-col :span="2">
        <el-col :span="3">
          <el-select v-model="stateValue" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
                     filterable style="width: 140px">
            <el-option
@@ -685,17 +662,11 @@
            />
          </el-select>
        </el-col>
        <el-col :span="1">
        <el-col :span="6">
          <el-button type="primary" @click="save">保存</el-button>
        </el-col>
        <el-col :span="1">
          <el-button type="warning" @click="clear">清空</el-button>
        </el-col>
        <el-col :span="1">
          <el-button :disabled="!tag.id" type="danger" @click="deleteTag">删除</el-button>
        </el-col>
        <el-col :span="1">
          <el-button type="danger" @click="htmlPrint">预览</el-button>
          <el-button type="primary" @click="htmlPrint">预览</el-button>
        </el-col>
      </el-row>


 north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue

@@ -314,6 +314,7 @@
const selectOrderList = ()=>{
  request.post(`/Replenish/SelectReplenish/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
    if(res.code==200){
      console.log(res.data)
      if (res.data.total!=null){
        total.dataTotal = res.data.total.total*1
        total.pageTotal= res.data.total.pageTotal
@@ -408,7 +409,14 @@
      </template>

      <template #state="{ row,column}">
        <el-checkbox @click.native.prevent  :checked="row[column.field]===1"/>
        <el-checkbox
            v-if="row[column.field] === 1"
            @click.native.prevent
            :checked="true"/>
        <el-checkbox
            v-else
            @click.native.prevent
            :checked="false"/>
      </template>

      <template #pager>

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue

@@ -833,6 +833,7 @@
:deep(#sizeCheck .el-dialog__body) {
  height: 90%;
  width: 100%;
  overflow-y: auto;
}

:deep(#sizePrintCalrd .el-dialog__body) {
@@ -854,7 +855,7 @@
}

:deep(#titleStyle .el-dialog__body) {
  height: 95%;
  height: 85%;
  width: 100%;
  overflow-y: auto;
}

 north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue

@@ -387,7 +387,14 @@
      </template>

      <template #state="{ row,column}">
        <el-checkbox @click.native.prevent  :checked="row[column.field]===1"/>
        <el-checkbox
            v-if="row[column.field] === 1"
            @click.native.prevent
            :checked="true"/>
        <el-checkbox
            v-else
            @click.native.prevent
            :checked="false"/>
      </template>

      <template #pager>

 north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml

@@ -214,7 +214,6 @@
            </if>
        </where>
              ) as zu
        limit #{offset},#{pageSize};
    </select>



 north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml

@@ -220,8 +220,7 @@
                and r.reviewer regexp #{rework.reviewer}
            </if>
        </where>
              ) as zu
        limit #{offset},#{pageSize};
        ) as zu;
    </select>

    <select id="getSelectRework">