1

src/views/modules/base/companyInformation.vue

@@ -54,7 +54,7 @@
     </el-table>
     <el-dialog title="会计单位维护" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="480px" >
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'会计单位编号：'">
+        <el-form-item :label="'会计单位编码：'">
           <el-input v-model="modelData.companyID"  :disabled="modelInputFlag" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'会计单位名称：'">
@@ -294,6 +294,12 @@
         if(localStorage.getItem('companyInformation')!=undefined){
           this.getData()
         }
+      },
+      modelData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modelData.companyID = this.modelData.companyID.toUpperCase()
+        }
       }
     },
     methods: {
@@ -342,7 +348,7 @@
       },
       saveData(){
           if(this.modelData.companyID==''||this.modelData.companyID==null){
-            this.$alert("请输入会计单位编号！",'错误',{
+            this.$alert("请输入会计单位编码！",'错误',{
               confirmButtonText:'确定'
             })
             return false;

src/views/modules/base/factoryInformation.vue

@@ -53,7 +53,7 @@
     </el-table>
     <el-dialog title="工厂信息维护" :close-on-click-modal="false" v-drag :visible.sync="siteFlag" width="630px" >
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'工厂编号：'">
+        <el-form-item :label="'工厂编码：'">
           <el-input v-model="siteData.siteID" :disabled="siteInputFlag" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'工厂名称(中文)：'">
@@ -620,6 +620,13 @@
           if(localStorage.getItem('factoryInformation')!=undefined){
             this.getData();
           }
+        },
+        siteData: {
+          deep: true,
+          handler: function (newV, oldV) {
+            this.siteData.companyID = this.modelData.companyID.toUpperCase()
+            this.siteData.siteID = this.modelData.siteID.toUpperCase()
+          }
         }
       },
       methods: {

src/views/modules/base/operator.vue

@@ -101,7 +101,7 @@
         <el-form-item :label="'工厂编号：'">
           <el-input v-model="modalData.site" disabled style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="'操作员ID：'">
+        <el-form-item :label="'操作员编码：'">
           <el-input v-model="modalData.operatorID" :disabled="InputFlag" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'操作员姓名：'">
@@ -208,6 +208,20 @@
         InputFlag:false,
       }
     },
+    watch: {
+      modelData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modelData.operatorID = this.modelData.operatorID.toUpperCase()
+        }
+      },
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.operatorID = this.searchData.operatorID.toUpperCase()
+        }
+      },
+    },
     mounted() {
       this.$nextTick(()=>{
         this.height = window.innerHeight - 210;
@@ -267,7 +281,7 @@
           return false;
         }
         if(this.modalData.operatorID==''||this.modalData.operatorID==null){
-          this.$alert("请输入操作员ID！",'错误',{
+          this.$alert("请输入操作员编码！",'错误',{
             confirmButtonText:'确定'
           })
           return false;

src/views/modules/base/resource.vue

@@ -8,7 +8,7 @@
       <el-form-item :label="'名称：'">
         <el-input v-model="modelData.workCenterDesc" readonly style="width: 130px"></el-input>
       </el-form-item>
-      <el-form-item :label="'工厂编号：'">
+      <el-form-item :label="'工厂编码：'">
         <el-input v-model="modelData.site" readonly style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态：'">
@@ -31,26 +31,26 @@
     </el-form>
     <el-tabs v-model="activeName" >
       <el-tab-pane :label="'基本信息'" name="first">
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;margin-left: 10px">
           <el-form-item :label="'加工中心类型：'">
             <el-input v-model="modelData.workCenterType" readonly style="width: 130px"></el-input>
           </el-form-item>
-          <el-form-item :label="'生产线编码：'">
+          <el-form-item :label="'生产线编码：'" style="margin-left: 10px">
             <el-input v-model="modelData.departmentNo" readonly style="width: 130px"></el-input>
           </el-form-item>
-          <el-form-item :label="'生产线名称：'">
+          <el-form-item :label="'生产线名称：'" style="margin-left: 10px">
             <el-input v-model="modelData.departmentDesc" readonly style="width: 130px"></el-input>
           </el-form-item>
-          <el-form-item :label="'生产能力：'">
+          <el-form-item :label="'生产能力：'" style="margin-left: 10px">
             <el-input v-model="modelData.capacityType" readonly style="width: 130px"></el-input>
           </el-form-item>
         </el-form>
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
+        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 10px;margin-left: 10px">
           <el-form-item :label="'新增日期：'">
             <el-input v-model="modelData.createdDate" readonly style="width: 130px"></el-input>
           </el-form-item>
-          <el-form-item :label="'备注：'">
-            <el-input v-model="modelData.remark" readonly style="width: 417px"></el-input>
+          <el-form-item :label="'备注：'" style="margin-left: 10px">
+            <el-input v-model="modelData.remark" readonly style="width: 437px"></el-input>
           </el-form-item>
 
         </el-form>
@@ -119,7 +119,7 @@
     </el-dialog>
     <el-dialog title="机台维护" :close-on-click-modal="false" v-drag :visible.sync="modelFlag3" width="600px" >
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'工厂编号：'">
+        <el-form-item :label="'工厂编码：'">
           <el-input v-model="modelData3.site" disabled style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'加工中心编码：'">
@@ -451,7 +451,7 @@
             columnProp: "site",
             headerAlign: "center",
             align: "left",
-            columnLabel: "工厂编号",
+            columnLabel: "工厂编码",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,

src/views/modules/base/shift.vue

@@ -53,7 +53,7 @@
     </el-table>
     <el-dialog title="班次信息维护" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="470px" >
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'工厂编号：'">
+        <el-form-item :label="'工厂编码：'">
           <el-input v-model="modalData.site" :disabled="InputFlag" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'班次编码：'">
@@ -294,7 +294,13 @@
         if(localStorage.getItem('factoryInformation')!=undefined){
           this.getData();
         }
-      }
+      },
+      modalData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modalData.shiftNo = this.modalData.shiftNo.toUpperCase()
+        }
+      },
     },
     methods: {
       getBaseData(val){

src/views/modules/board/scheduleBoard.vue

@@ -25,7 +25,7 @@
         <el-table-column
           prop="seqNo"
           header-align="center"
-          align="right"
+          align="left"
           min-width="80"
           style="font-size: 20px"
           label="派工单号">

src/views/modules/schedule/schedule.vue

@@ -81,7 +81,7 @@
             <el-option label="已派工完" value="ROUND(ISNULL(SL.QtyScheduled,0),3) >=ROUND(so.LotSize,3)"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'加工中心编号：'">
+        <el-form-item :label="'加工中心编码：'">
           <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
@@ -137,7 +137,7 @@
         <el-form-item label="订单号:">
           <el-input v-model="schedulingModalData.orderNo" disabled style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="工厂编号:">
+        <el-form-item label="工厂编码:">
           <el-input v-model="schedulingModalData.site" disabled style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="要求完工日期:">
@@ -350,6 +350,7 @@
         <el-table
           height="200"
           :data="schedulesModalTableData"
+          ref="tables"
           border
           style="width: 100%">
           <el-table-column
@@ -735,6 +736,22 @@
         shiftList:[],
       }
     },
+    watch: {
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.partNo = this.searchData.partNo.toUpperCase()
+          this.searchData.partNo = this.searchData.partNo.toUpperCase()
+        }
+      },
+      modelData3: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modelData3.resourceID = this.modelData3.resourceID.toUpperCase()
+
+        }
+      },
+    },
     mounted() {
       this.$nextTick(()=>{
         this.height = window.innerHeight - 220;
@@ -824,7 +841,7 @@
           scheduleQty: '',
           resourceId: this.schedulingModalData.resourceId,
           shiftNo: this.schedulingModalData.shiftNo,
-          scheduleDate: null,
+          scheduleDate: new Date(),
           operatorId:this.schedulingModalData.operatorId,
         })
         this.sumQty += this.schedulingModalData.scheduleQty
@@ -913,7 +930,7 @@
           }
         }
         if(flag){
-          this.$confirm(`派工日期大于需求完成日期，是否继续`, '提示', {
+          this.$confirm(`派工日期晚于需求完成日期，是否继续`, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -1009,12 +1026,16 @@
         }
         this.schedulesModalTableData=JSON.parse(JSON.stringify(this.dataListSelections))
         this.schedulesModalData = []
+        this.schedulesModalData.scheduleDate=new Date();
         let inData={
           site:this.dataListSelections[0].site,
           workCenterNo:this.dataListSelections[0].workCenterNo
         }
         this.getAvailableResourceList(inData)
         this.getWorkCenterOperatorList(inData);
+        // this.$nextTick(()=>{
+        //   this.$refs['tables'].doLayout();
+        // });
         this.schedulesModalFlag=true;
 
       },

src/views/modules/schedule/searchSOScheduleRouting.vue

@@ -14,6 +14,20 @@
       <el-form-item :label="'工序编号'">
         <el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'班次'">
+        <el-select v-model="searchData.sShiftNo" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="白班" value="白班"></el-option>
+          <el-option label="晚班" value="晚班"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="'是否关闭'">
+        <el-select v-model="searchData.closedFlag" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="是" value="Y"></el-option>
+          <el-option label="否" value="N"></el-option>
+        </el-select>
+      </el-form-item>
     </el-form>
     <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
       <el-form-item :label="'派工日期：'">
@@ -41,20 +55,6 @@
         <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
         <el-input v-model="searchData.sResourceID" style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'班次'">
-        <el-select v-model="searchData.sShiftNo" style="width: 120px">
-          <el-option label="全部" value=""></el-option>
-          <el-option label="白班" value="白班"></el-option>
-          <el-option label="晚班" value="晚班"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="'是否关闭'">
-        <el-select v-model="searchData.closedFlag" style="width: 120px">
-          <el-option label="全部" value=""></el-option>
-          <el-option label="是" value="Y"></el-option>
-          <el-option label="否" value="N"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item :label="' '">
         <el-button @click="search()" style="margin-left: 0px;margin-top:0px" type="primary">查询</el-button>
         <download-excel