Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES

廖井涛

2023-07-24 60c964f8e9d74474e6b179c88da51369c65fe8f0

Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES

 gmms/WebContent/js/static/js/vue.js

@@ -12012,3 +12012,15 @@
  return Vue;

}));
Vue.directive('preventreclick', {
    inserted(el, binding) {
         el.addEventListener('click', () => {
         if (!el.disabled) {
           el.disabled = true
           setTimeout(() => {
             el.disabled = false
           }, binding.value || 2000)
         }
       })
     }
});

 gmms/WebContent/login/machinelistcontent.jsp

@@ -33,7 +33,7 @@
      :data="machine"
      height='700'
      style="width: 100%;"
       :row-class-name="tableRowClassName"
       :cell-class-name="tableRowClassName"
      >
      <el-table-column
        prop="name"
@@ -49,7 +49,7 @@
      </el-table-column>
      <el-table-column
        prop="st"
        label="状态̬">
        label="状态">
      </el-table-column>
      <el-table-column
        prop="count"
@@ -66,12 +66,14 @@
        machine:<%out.print(  Manager.getDevice().toString());%>,
      },
      methods:{
          tableRowClassName({row, rowIndex}) {
          tableRowClassName({row,column,rowIndex,columnIndex}) {
              
                if (row['st'] == '未连接') {
               if (row['st'] == '未连接' && columnIndex==3 ) {
                 return 'success-row';
               }else{
                 return ''; 
               }
               return ''; 
   	        
          }
      }
     })

 gmms/WebContent/orderManage/order.jsp

@@ -59,7 +59,9 @@
                <el-button v-if="orderData[scope.$index]['11_order_status']<2"
                  @click.native.prevent="updateOrderState(scope.$index, orderData)"
                  type="text"
                  size="small">
                  size="small"
                  v-preventReClick
                  >
                  {{orderData[scope.$index]['11_order_status']==0?'审核':'反审'}}
                </el-button>

@@ -70,6 +72,7 @@
                          修改
                </el-button>
                <el-button 
                  v-if="orderData[scope.$index]['11_order_status']>1"
                  @click.native.prevent="open(scope.$index, orderData)"
                  type="text"
                  size="small">
@@ -93,8 +96,8 @@
        
        <el-form v-show="!showFlag" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" style="width: 25%;margin: auto;">
          <el-form-item>
            <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')">修改</el-button>
            <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')">提交</el-button>
            <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')" v-preventReClick >修改</el-button>
            <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')" v-preventReClick >提交</el-button>
            <el-button @click="resetForm('ruleForm')">重置</el-button>
          </el-form-item>
          
@@ -135,7 +138,7 @@
              
              <el-form-item>
                <el-button @click="resetForm('wornGlass');wornGlassFLAG = false">取 消</el-button>
                <el-button v-show="!updateShowFlag" type="primary" @click="wornSub('wornGlass')">提交</el-button>
                <el-button v-show="!updateShowFlag" type="primary" @click="wornSub('wornGlass')" v-preventReClick>提交</el-button>
              </el-form-item>
            </el-form>
            
@@ -214,7 +217,7 @@
          ruleForm: {
          produceid:"",
          glassNum:"",
          creator:""
          creator:'<%= request.getParameter("xingming") %>'
        },
        rules: {
          produceid: [
@@ -257,7 +260,7 @@
              return false;
            }
            let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
                  this.connects("订单新增",sql,1,1);
            this.connects("订单新增",sql,1,1);
          });
        },
        resetForm(formName) {//清除新增重置
@@ -273,7 +276,7 @@
          this.updateShowFlag=true;
          let rowObj=row[index]
          this.ruleForm.glassNum=rowObj["5_smallglass_no"]
          this.ruleForm.produceid=rowObj["2_recipe_no"]
          this.ruleForm.produceid=rowObj["12_id"]
          this.updateOrder.id=rowObj["0_id"]
          
        },
@@ -317,7 +320,8 @@
          if(arrFlag==0){
            sql="{call AXJ_a_order_select_into()}"
          }
          loadAjxs('产品查询',sql,2,"orderData")
          this.loading=true
          this.loadAjxss('订单查询',sql,2,"orderData")
        },
        selectTimeOrder:function(){
          let arrObj={}
@@ -334,7 +338,9 @@
            arrObj.endtime=''
            sql="{call AXJ_a_order_select_into()}"
          }
          loadAjxs('产品查询',sql,2,"orderData")
          this.loading=true
          this.loadAjxss('订单查询',sql,2,"orderData")
          //loadAjxs('产品查询',sql,2,"orderData")

        },
        open(index,row) {//打开刺破界面

 gmms/WebContent/orderManage/produce.jsp

@@ -46,7 +46,7 @@
                  @click.native.prevent="updateRow(scope.$index, produceData)"
                  type="text"
                  size="small">
                  修改
                       修改
                </el-button>
              </template>
            </el-table-column>
@@ -67,8 +67,8 @@
        
        <el-form v-show="!showFlag" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" style="width: 25%;float: right;margin-right: 20%;">
          <el-form-item>
            <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')">修改</el-button>
            <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')">提交</el-button>
            <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')" v-preventReClick ='3000'>修改</el-button>
            <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')" v-preventReClick='3000'>提交</el-button>
            <el-button @click="resetForm('ruleForm')">重置</el-button>
          </el-form-item>
          
@@ -189,7 +189,7 @@
          thickness: '',
          color:'',
          optNum:'',
          creator:'',
          creator:'<%= request.getParameter("xingming") %>',
          route:''
        },
        rules: {
@@ -237,8 +237,9 @@
            if (!valid) { 
              return false;
            }
            this.ruleForm.creator='<%= request.getParameter("xingming") %>';
            let sql="{call AXJ_a_produce_insert(?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(this.ruleForm);
                  this.connects("新增产品",sql,1,1);
            this.connects("新增产品",sql,1,1);
          });
        },
        resetForm(formName) {
@@ -326,7 +327,6 @@

    })
    



  </script>