海尔二期
parent: fed92812 | 补丁 | 提交 | ignore whitespace
严智鑫
2025-04-19 be5401cc838fbd4f26bc53f31af97d73041042d9 
Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II
4个文件已修改
46 ■■■■■ 已修改文件
gmms/WebContent/bigScreen/twoglassCut.jsp 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/mysqlInsert/mysql_connect.jsp 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/orderManage/order.jsp 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/qiegeguanli/qiegerenwu.jsp 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 gmms/WebContent/bigScreen/twoglassCut.jsp


@@ -242,37 +242,37 @@


                        <td>2025-03-30</td>


                        <td>智能家电</td>


                        <td>菜阳原电</td>


                        <td>清毒桶线</td>


                        <td>厨电二期</td>


                        <td>7,098</td>


                        <td>7,897</td>


                        <td>799</td>


                        <td>111.26%</td>


                    </tr>


                    <tr>


                        <td>2025-03-30</td>


                        <td>2025-03-31</td>


                        <td>厨房电</td>


                        <td>菜阳原电</td>


                        <td>焊机A线</td>


                        <td>厨电二期</td>


                        <td>1,898</td>


                        <td>2,478</td>


                        <td>580</td>


                        <td>130.56%</td>


                    </tr>


                    <tr>


                        <td>2025-03-30</td>


                        <td>2025-04-1</td>


                        <td>厨房电</td>


                        <td>菜阳原电</td>


                        <td>焊机B线</td>


                        <td>厨电二期</td>


                        <td>2,300</td>


                        <td>2,300</td>


                        <td>0</td>


                        <td>100.00%</td>


                    </tr>


                    <tr>


                        <td>2025-03-30</td>


                        <td>2025-04-2</td>


                        <td>厨房电</td>


                        <td>菜阳原电</td>


                        <td>厨房自清洁</td>


                        <td>厨电二期</td>


                        <td>2,300</td>


                        <td>2,300</td>


                        <td>0</td>




 gmms/WebContent/mysqlInsert/mysql_connect.jsp


@@ -6,7 +6,7 @@


<head>


<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">


<title>Insert title here</title>


    




</head>


<body>






 gmms/WebContent/orderManage/order.jsp


@@ -107,7 +107,15 @@


          <el-form-item label="小片数量" prop="glassNum">


            <el-input  v-model="ruleForm.glassNum"  autocomplete="off" ></el-input>


          </el-form-item>




          <el-form-item label="原片数量" prop="bigGlassNum">


            <el-input  v-model="ruleForm.bigGlassNum"  autocomplete="off" ></el-input>


          </el-form-item>


          <el-form-item label="原片长" prop="bigGlassLength:">


            <el-input  v-model="ruleForm.bigGlassLength"  autocomplete="off" ></el-input>


          </el-form-item>


          <el-form-item label="原片宽" prop="bigGlassWidth">


            <el-input  v-model="ruleForm.bigGlassWidth"  autocomplete="off" ></el-input>


          </el-form-item>


          <el-form-item label="配方号" prop="produceid">


            <template>


              <el-select v-model="ruleForm.produceid" placeholder="请选择" clearable filterable>


@@ -220,6 +228,9 @@


          ruleForm: {


          produceid:"",


          glassNum:"",


            bigGlassNum:"",


            bigGlassLength:"",


            bigGlassWidth:"",


          creator:'',


        },


        rules: {


@@ -229,6 +240,17 @@


          glassNum: [


            { validator: checkInt, trigger: 'blur' }


          ],


          bigGlassLength: [


            { validator: checkInt, trigger: 'blur' }


          ],




          bigGlassNum: [


            { validator: checkInt, trigger: 'blur' }


          ],


          bigGlassWidth: [


            { validator: checkInt, trigger: 'blur' }


          ],




          wornNum: [


            { validator: checkInt, trigger: 'blur' }


          ],


@@ -263,7 +285,7 @@


              return false;


            }


            this.ruleForm.creator='<%= request.getParameter("xingming")%>';


            let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);


            let sql="{call AXJ_a_order_add(?,?,?,?,?,?,?)}~"+JSON.stringify(this.ruleForm);


            this.connects("订单新增",sql,1,1);


          });


        },




 gmms/WebContent/qiegeguanli/qiegerenwu.jsp


@@ -88,8 +88,8 @@


                        <tbody>


                            <tr v-for="item in shuzu" style="height: 51px;">


                                <td>{{item['1_order_id']}}</td>


                                <td>{{item['2_original_width']}}</td>


                                <td>{{item['3_original_height']}}</td>


                                <td>{{item['2_largeglass_length']}}</td>


                                <td>{{item['3_largeglass_width']}}</td>


                                <td>{{item['4_width']}}</td>


                                <td>{{item['5_height']}}</td>


                                <td>{{item['6_thickness']}}</td>