Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-22 54eb50ff3bf802e0d784065a710313395ed56800

Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

 north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue

@@ -36,6 +36,21 @@

const userinfo=[]

//定义接收加载表头下拉数据
const titleSelectJson = ref({
})

//页面第一次加载
request.get(`/basicData/BasicDataByType/product/stuffColor`).then((res) => {

  if(res.code==200){
    titleSelectJson.value=deepClone(res.data)
    console.log(titleSelectJson.value)
  }else{
    ElMessage.warning(res.msg)
  }
})




@@ -168,8 +183,19 @@
     <el-row gutter="5"
             v-for="item in BasicData" >
       <el-col :span="4.5" >
         {{item.OperateTypeName}}：<el-input v-model="item.Type"  placeholder="请输入数据" style="width: 150px; height: 30px;" />
         {{item.OperateTypeName}}：
         <el-select filterable v-if="item.OperateTypeName=='膜系'" v-model="item.Type"  placeholder="请输入数据" style="width: 150px; height: 30px;" >
           <el-option
               v-for="item in titleSelectJson"
               :key="item.id"
               :label="item.basicName"
               :value="item.basicName"
           />
         </el-select>
         <el-input v-else v-model="item.Type"  placeholder="请输入数据" style="width: 150px; height: 30px;" />

       </el-col>

       <el-divider ></el-divider> <!-- 添加分隔线 -->



 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue

@@ -228,6 +228,7 @@
    margin-top:8mm;

  }
  /*#fen {page-break-after: always;}*/
}
#table1 tr{
  height: 30px;