提交产品界面修改

廖井涛

2024-06-20 aeb57f6ea1150880cfc2f48604ff1965a179e4d4

提交产品界面修改

 north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue

@@ -11,7 +11,8 @@

let basic = ref({
  basicType : ['',''],
  input:''
  input:'',
  nickname:''
})
let options=ref([
  { "label": t('orderBasicData.order'),
@@ -128,6 +129,7 @@
    basic.value.basicType[0] =  props.rowIndex.basicType
    basic.value.basicType[1] =  props.rowIndex.basicCategory
    basic.value.input =  props.rowIndex.basicName
    basic.value.nickname =  props.rowIndex.nickname
  }
})

@@ -145,6 +147,7 @@
  submitArr.basicType = basic.value.basicType[0]
  submitArr.basicCategory = basic.value.basicType[1]
  submitArr.basicName = basic.value.input
  submitArr.nickname = basic.value.nickname
  request.post(`/basicData/updateBasicData`, submitArr).then(res => {
    if (res.data) {
      ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -184,6 +187,12 @@
      </el-col>
    </el-row>
    <el-row>
      <el-col :span="4">{{ $t('mainBasicData.operateType') }}:</el-col>
      <el-col :span="12">
        <el-input v-model="basic.nickname"/>
      </el-col>
    </el-row>
    <el-row>
      <el-col :span="4"></el-col>
      <el-col :span="12">
        <el-button v-show="!props.rowIndex" @click="saveBasicData" type="primary">{{ $t('basicData.insert') }}</el-button>

 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue

@@ -44,6 +44,7 @@
    {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
    {type: 'seq', title: t('basicData.number'), width: 80 ,fixed:"left",},
    {field:'basicName',title: t('orderBasicData.name')},
    {field:'nickname',title: t('mainBasicData.operateType')},
    {field:'createTime',title: t('basicData.creationTime')},



 north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue

@@ -68,6 +68,7 @@
  thickness:'',
  totalThickness:'',
  typeId:'',
  productAbbreviation:'',
  creator:userInfo.user.userName
})

@@ -106,6 +107,7 @@
})

const saveProduct = () => {
  console.log(productDetailList.value)
  if(productDetailList.value.length===0){
    ElMessage.warning(t('product.msg.productLength'))
    return
@@ -131,11 +133,13 @@
      }
      case 'hollow' :{
        productName+='*'+item.detail+"*"
        console.log(item.detail.slice(0,-2))
        break
      }
    }
  })
  productTotal.value.productName=productName
  productTotal.value.productAbbreviation=productName.split("mm").join("")
  let product = {
    title: productTotal.value,
    detail:productDetailList.value
@@ -513,8 +517,8 @@
              clearable :placeholder="$t('product.msg.hollowGasType')" >
            <el-option v-for="item in BasicData.hollowGasType"
                       :key="item.id"
                       :label="item.basicName"
                       :value="item.basicName"
                       :label="item.basicName+'('+item.nickname+')'"
                       :value="item.nickname"
            />
          </el-select>
          <el-select
@@ -524,8 +528,8 @@
              clearable :placeholder="$t('product.msg.hollowType')" >
            <el-option v-for="item in BasicData.hollowType"
                       :key="item.id"
                       :label="item.basicName"
                       :value="item.basicName"
                       :label="item.basicName+'('+item.nickname+')'"
                       :value="'('+item.nickname+')'"
            />
          </el-select>
          <el-select
@@ -571,8 +575,8 @@
              clearable :placeholder="$t('product.msg.interlayerType')" >
            <el-option v-for="item in BasicData.InterlayerType"
                       :key="item.id"
                       :label="item.basicName"
                       :value="item.basicName"
                       :label="item.basicName+'('+item.nickname+')'"
                       :value="'('+item.nickname+')'"
            />
          </el-select>
          <el-select
@@ -731,13 +735,13 @@
            <el-button
                @click = "updateInterlayer(index)"
                size="small"
                type="primary">{{ $t('product.msg.updateHollow') }}</el-button>
                type="primary">{{ $t('product.msg.updateInterlayer') }}</el-button>
          </el-col>
          <el-col :span="4" v-show="item.detailType === 'hollow'">
            <el-button
                @click = "updateHollow(index)"
                size="small"
                type="primary">{{ $t('product.msg.updateInterlayer') }}</el-button>
                type="primary">{{ $t('product.msg.updateHollow') }}</el-button>
          </el-col>
          <el-col :span="16">
            <el-input

 north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue

@@ -139,6 +139,7 @@
//第一次加载数据
request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
  if(res.code==200){
    console.log(res.data.data)
    pageTotal.value=res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    xGrid.value.reloadData(produceList)
@@ -213,6 +214,7 @@
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
    {field: 'id', title: t('basicData.number'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'productName', title: t('product.productName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'productAbbreviation', title: '产品简称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'basicGlassType.typeName', title: t('product.typeName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'query', title: t('product.query'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'remarks', title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},

 north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicData.java

@@ -12,6 +12,7 @@
    private Integer id;
    private String basicType;
    private String basicName;
    private String nickname;
    private String basicCategory;
    private LocalDate createTime;
    private LocalDate updateTime;

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java

@@ -12,6 +12,7 @@
    @TableId(type = IdType.AUTO)
    private Long id;
    private String productName;
    private String productAbbreviation;
    private String typeId;
    private String typeName;
    private Double totalThickness;

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java

@@ -141,6 +141,7 @@
            basicData.setBasicType(basicTypeList.get(0));
            basicData.setBasicCategory(basicTypeList.get(1));
            basicData.setBasicName(map.get("input").toString());
            basicData.setNickname(map.get("nickname").toString());
            basicDateMapper.insert(basicData);
        }
        return true;

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -107,7 +107,7 @@
        JSONObject orderJson = new JSONObject(orderMap);
        Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
        Map<String,Object> map = new HashMap<>();
        if(order.getOrderId()!=null){
        if(order.getOrderId()!=null && !order.getOrderId().isEmpty()){
            map.put("data",0);
        }else{
            map.put("data",orderMapper.selectOrder(order));

 north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml

@@ -6,7 +6,7 @@
    <resultMap id="productMap" type="com.example.erp.entity.sd.Product" >
        <id column="id" property="id"/>
        <result column="product_name" property="productName"/>
        <result column="product" property="productName"/>
        <result column="product_abbreviation" property="productAbbreviation"/>
        <result column="total_thickness" property="totalThickness"/>
        <result column="thickness" property="thickness"/>
        <result column="query" property="query"/>
@@ -29,6 +29,7 @@
    <select id="defaultProduct" resultMap="productMap">
        select a.id ,
        a.product_name,
        a.product_abbreviation,
        a.total_thickness,
        a.thickness,
        a.query,
@@ -51,6 +52,9 @@
            <if test="product.productName != null and product.productName != ''">
                and a.product_name like concat('%',#{product.productName},'%')
            </if>
            <if test="product.productAbbreviation != null and product.productAbbreviation != ''">
                and a.product_abbreviation like concat('%',#{product.productAbbreviation},'%')
            </if>
            <if test="product.basicGlassType.typeName != null and product.basicGlassType.typeName!= ''">
                and bgt.type_name like concat('%',#{product.basicGlassType.typeName},'%')
            </if>