0412 新看板

src/store/modules/user.js

@@ -6,10 +6,10 @@ export default {
     site: 0,
     languageDefault: '',
     userDisplay: '',
-    padSopUrl:'http://192.168.2.172/upload/',
-    tvSopUrl:'http://192.168.2.172/sopFile/',
-    // padSopUrl:'http://192.168.1.83:81/upload/',
-    // tvSopUrl:'http://192.168.1.83:81/upload/',
+    // padSopUrl:'http://192.168.2.172/upload/',
+    // tvSopUrl:'http://192.168.2.172/sopFile/',
+    padSopUrl:'http://192.168.1.83:81/upload/',
+    tvSopUrl:'http://192.168.1.83:81/upload/',
   },
   mutations: {
     updateId (state, id) {

src/views/modules/Abnormal/AbnormalFeedBack.vue

@@ -240,7 +240,10 @@
         <span style="font-size: 12px">工装&nbsp&nbsp&nbsp</span> <el-input v-model="abnormalFeedBackData.workClothesTemporary" :disabled="disableFlag2" style="width: 70px"></el-input>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
-        <el-form-item label="长久处理方式">
+        <el-form-item label="根本原因分析">
+          <el-input v-model="abnormalFeedBackData.rootCause" type="textarea" :disabled="disableFlag3" :rows="3" resize='none' style="width: 562px"></el-input>
+        </el-form-item>
+        <el-form-item label="长久处理方式" style="margin-top: 40px;">
           <el-input v-model="abnormalFeedBackData.treatment" type="textarea" :disabled="disableFlag3" :rows="3" resize='none' style="width: 562px"></el-input>
         </el-form-item>
       </el-form>
@@ -328,6 +331,7 @@
           "材料": "materialTemporary",
           "模具": "mouldTemporary",
           "工装": "workClothesTemporary",
+          "根本原因分析": "rootCause",
           "长久处理方式": "treatment",
           "温度 ": "temperature",
           "压力 ": "pressure",
@@ -503,6 +507,12 @@
           })
           return false;
         }
+        if( this.disableFlag3==false&&(this.abnormalFeedBackData.rootCause==null||this.abnormalFeedBackData.rootCause=='')){
+          this.$alert("请填写根本原因分析", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
         saveAbnormalDetail(this.abnormalFeedBackData).then(({data}) => {
           if (data && data.code === 0) {
             this.modalFlag=false

src/views/modules/production/bagLabels.vue

@@ -4,6 +4,9 @@ import {
   getPackagePrintDataList,
   getSOScheduleRoutingDataPrint
 } from "../../../api/production/generateReport";
+import {
+  getPhotoAddressData
+} from '@/api/pad.js'
 import {printPackageLabelNoPreview} from "../print/print_package_label-NOOREVIEW";
 export default {
   data(){
@@ -16,7 +19,20 @@ export default {
       flag:false,
       soScheduleRouting:{
 
-      }
+      },
+      picData:{
+        site:'',
+        partNo:'',
+      },
+      fileTitle:"文件名   （"+0+"/"+0+")",
+      fileName:'',
+      num:1,
+      currentData:'',
+      photoDatas:[],
+      uploadImg:[],
+      showviewer: false,
+      url: '',
+      photoUrl:'',
     }
   },
   mounted() {
@@ -71,11 +87,24 @@ export default {
           }
         }else {
           this.$message.warning(data.msg)
+          this.cleanAll()
         }
       }).catch((error)=>{
+        this.cleanAll()
         this.$message.error(error);
       })
     },
+    cleanAll(){
+      Object.keys( this.soScheduleRouting).forEach(key => {
+        this.soScheduleRouting[key] = '';
+      });
+      Object.keys( this.picData).forEach(key => {
+        this.picData[key] = '';
+      });
+      this.fileName=null;
+      this.fileTitle="文件名   （"+0+"/"+0+")";
+      this.photoUrl=null;
+    },
     checkIsPacking(){
       let params = {
         site:this.soScheduleRouting.site,
@@ -83,8 +112,9 @@ export default {
       }
       checkIsPacking(params).then(({data})=>{
         if (data && data.code === 0){
-
+          this.getData(this.soScheduleRouting.site,this.soScheduleRouting.partNo)
         }else {
+          this.getData('','')
           this.soScheduleRouting={};
           this.$message.warning(data.msg)
           this.searchData = {
@@ -146,7 +176,63 @@ export default {
       }
       params.number = this.number;
       this.printPackageLabelNoPreview(params)
+    },
+    getData(site,partNo){
+      this.picData.partNo = partNo;
+      this.picData.site=  site;
+      this.getPhoto();
+
+    },
+    getPhoto(){
+      getPhotoAddressData(this.searchData).then(({data}) => {
+        this.photoDatas = data.rows;
+        if(this.photoDatas.length==0){
+          this.fileTitle="文件名   （"+0+"/"+0+")";
+          this.photoUrl=null;
+          return false;
+        }
+        this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
+        this.fileTitle="文件名   （"+this.num+"/"+this.photoDatas.length+")";
+        this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
+        // this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
+      })
+    },
+    nextPicture(){
+      if(this.photoDatas.length==0){
+        this.fileTitle="文件名   （"+0+"/"+0+")";
+        this.$alert('该物料没有上传图片！', '错误', {
+          confirmButtonText: '确定'
+        })
+        return false;
+      }
+      if(this.num==this.photoDatas.length){
+        this.num=1;
+      }else{
+        this.num=this.num+1;
       }
+      this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
+      this.fileTitle="文件名   （"+this.num+"/"+this.photoDatas.length+")";
+      this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
+      // this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
+    },
+    lastPicture(){
+      if(this.photoDatas.length==0){
+        this.fileTitle="文件名   （"+0+"/"+0+")";
+        this.$alert('该物料没有上传图片！', '错误', {
+          confirmButtonText: '确定'
+        })
+        return false;
+      }
+      if(this.num==1){
+        this.num=this.photoDatas.length;
+      }else{
+        this.num=this.num-1;
+      }
+      this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
+      this.fileTitle="文件名   （"+this.num+"/"+this.photoDatas.length+")";
+      this.photoUrl=this.$store.state.user.padSopUrl+this.photoDatas[this.num-1].attaFileNameDb;
+      // this.photoUrl='http://192.168.1.83:81/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
+    },
   },
 }
 </script>
@@ -168,7 +254,7 @@ export default {
       </el-form-item>
     </el-form>
     <div class="content">
-      <el-card style="height: 80vh;margin-top: 20px">
+      <el-card style="height: 800px;margin-top: 20px">
         <el-form :model="soScheduleRouting" label-position="top">
           <el-row :gutter="20">
             <el-col :span="6">
@@ -288,6 +374,31 @@ export default {
             </el-col>
           </el-row>
         </el-form>
+
+    <div class="pad" style="float: left;width: 33%;margin-top: 2%">
+      <h5 style="margin-left: 30px;font-size: 20px">产品图片</h5>
+      <el-form inline="true" style="margin-left: 30px" label-position="top">
+        <el-form-item :label="'产品编码：'" style="margin-left: 0px">
+          <el-input v-model="picData.partNo" readonly style="width: 220px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form inline="true" style="margin-top: 20px;margin-left: 30px" label-position="top">
+        <el-form-item :label="fileTitle">
+          <el-input v-model="fileName" style="width: 374px" readonly></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form inline="true" style="margin-top: 20px;margin-left: 30px" label-position="top">
+        <el-form-item :label="' '">
+          <el-button @click="lastPicture()" style="margin-left: 10px;height: 35px;width: 90px" type="primary">上一张</el-button>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-button @click="nextPicture()" style="margin-left: 25px;height: 35px;width: 90px" type="primary">下一张</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+        <div id="padPhoto" style="text-align: center;float: left;width: 66%;vertical-align:middle;margin-top: 5px" >
+          <img style="max-width:  100%;max-height: 450px;vertical-align:middle;" :src="photoUrl">
+        </div>
       </el-card>
     </div>
     <el-dialog title="提示" :visible.sync="flag" @open="()=>{

src/views/modules/production/bagLabels_old.vue

@@ -0,0 +1,340 @@
+<script >
+import {
+  checkIsPacking,
+  getPackagePrintDataList,
+  getSOScheduleRoutingDataPrint
+} from "../../../api/production/generateReport";
+import {printPackageLabelNoPreview} from "../print/print_package_label-NOOREVIEW";
+export default {
+  data(){
+    return{
+      searchData:{
+        seqNo:undefined,
+        flag:'',
+      },
+      number:1,
+      flag:false,
+      soScheduleRouting:{
+
+      }
+    }
+  },
+  mounted() {
+    this.$refs.focusInput.focus()
+  },
+  activated() {
+    this.$refs.focusInput.focus()
+  },
+  computed:{
+    seqNo:function (){
+      return this.searchData.seqNo;
+    }
+  },
+  watch:{
+
+  },
+  methods:{
+    selectBySeqNo(){
+      // 查询数据
+      this.getSOScheduleRoutingData();
+    },
+    getSOScheduleRoutingData(){
+      if (!this.searchData.seqNo){
+        this.$message.warning("派工单号为空")
+        return
+      }
+      let params = {
+        seqNo:this.searchData.seqNo,
+        userId:this.$store.state.user.name
+      };
+      getSOScheduleRoutingDataPrint(params).then(({data})=>{
+        if (data && data.code === 0){
+          if (data.total === 0){
+            this.$message.warning("派工单不存在")
+          }else if (data.total === 1){
+            this.soScheduleRouting = data.rows[0];
+            this.checkIsPacking()
+          }else {
+            this.soScheduleRouting = data.rows.find((item)=>item.site===this.$store.state.user.site && item.seqNo === this.searchData.seqNo)
+            this.checkIsPacking()
+          }
+          if (data.row){
+            this.soScheduleRouting.qtyBag = data.row[0].qtyBag
+            this.soScheduleRouting.bag = data.row[0].bag
+            this.soScheduleRouting.qty = data.row[0].qty
+            this.soScheduleRouting.carton = data.row[0].carton
+          }
+          if (data.data){
+            this.soScheduleRouting.sScheduledDate2 = data.data.sScheduledDate;
+            this.soScheduleRouting.operatorName2 = data.data.operatorName;
+            this.soScheduleRouting.approveQty2 = data.data.qtyApprove;
+          }
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error);
+      })
+    },
+    checkIsPacking(){
+      let params = {
+        site:this.soScheduleRouting.site,
+        workCenterNo:this.soScheduleRouting.sWorkCenterNo,
+      }
+      checkIsPacking(params).then(({data})=>{
+        if (data && data.code === 0){
+
+        }else {
+          this.soScheduleRouting={};
+          this.$message.warning(data.msg)
+          this.searchData = {
+            seqNo: undefined,
+            flag: '',
+          }
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+        this.searchData = {
+          seqNo: undefined,
+          flag: '',
+        }
+        this.soScheduleRouting={};
+      })
+    },
+    printLabel(){
+      if (!this.soScheduleRouting.site){
+        this.$message.warning("请先扫描派工单号")
+        return
+      }
+      if (this.soScheduleRouting.qtyBag === null || this.soScheduleRouting.qtyBag === undefined){
+        this.$message.warning("未维护每袋数量")
+        return;
+      }
+      let params = {
+        previousSeqNo:this.soScheduleRouting.previousSeqNo,
+        site:this.soScheduleRouting.site,
+        orderNo:this.soScheduleRouting.orderNo
+      }
+      if (this.searchData.flag === 'Y'){
+        this.flag = true;
+        return;
+      }
+      this.printPackageLabelNoPreview(params)
+    },
+    printPackageLabelNoPreview(params){
+      if (!params){
+        this.$message.warning("参数为空")
+        return
+      }
+      // 发起请求
+      getPackagePrintDataList(params).then(({data})=>{
+        if (data && data.code === 0){
+          printPackageLabelNoPreview(data.rows);
+          this.searchData.flag = '';
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    printLabelEntity(){
+      let params = {
+        previousSeqNo:this.soScheduleRouting.previousSeqNo,
+        site:this.soScheduleRouting.site,
+        orderNo:this.soScheduleRouting.orderNo
+      }
+      params.number = this.number;
+      this.printPackageLabelNoPreview(params)
+    }
+  },
+}
+</script>
+
+<template>
+  <div style="padding: 5px">
+    <el-form size="medium" class="title" :model="seqNo" label-position="top" :inline="true" >
+      <el-form-item label="派工单号">
+        <el-input-number size="medium" style="width: 100%;margin-top: -5px;" :controls="false" ref="focusInput" :min="0" v-model="searchData.seqNo" @keyup.enter.native="selectBySeqNo"></el-input-number>
+      </el-form-item>
+      <el-form-item label=" ">
+        <el-select v-model="searchData.flag" clearable>
+          <el-option value="" label="标准袋数"></el-option>
+          <el-option value="Y" label="零数袋"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label=" ">
+        <el-button type="primary" @click="printLabel">打印标签</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="content">
+      <el-card style="height: 80vh;margin-top: 20px">
+        <el-form :model="soScheduleRouting" label-position="top">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="派工单号">
+                <el-input v-model="soScheduleRouting.seqNo" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="工厂编码">
+                <el-input v-model="soScheduleRouting.site" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产订单号">
+                <el-input v-model="soScheduleRouting.orderNo" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label=" ">
+
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="产品编码">
+                <el-input v-model="soScheduleRouting.partNo" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="产品名称">
+                <el-input v-model="soScheduleRouting.partDesc" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="派工单类型">
+                <el-input v-model="soScheduleRouting.scheduleType" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="派工日期">
+                <el-input v-model="soScheduleRouting.sScheduledDate" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检验工单号">
+                <el-input v-model="soScheduleRouting.previousSeqNo" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检验日期">
+                <el-input v-model="soScheduleRouting.sScheduledDate2" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检验员">
+                <el-input v-model="soScheduleRouting.operatorName2" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检验合格数量">
+                <el-input v-model="soScheduleRouting.approveQty2" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="工序号">
+                <el-input v-model="soScheduleRouting.itemNo" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="工序名称">
+                <el-input v-model="soScheduleRouting.itemDesc" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label=" ">
+
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="机台ID">
+                <el-input v-model="soScheduleRouting.sResourceID" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="班次">
+                <el-input v-model="soScheduleRouting.sShiftNo" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="加工中心编码">
+                <el-input v-model="soScheduleRouting.sWorkCenterNo" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="操作员姓名">
+                <el-input v-model="soScheduleRouting.operatorName" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="每袋数量">
+                <el-input v-model="soScheduleRouting.qtyBag" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="每箱袋装数">
+                <el-input v-model="soScheduleRouting.bag" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="整箱数量">
+                <el-input v-model="soScheduleRouting.qty" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="纸箱尺寸">
+                <el-input v-model="soScheduleRouting.carton" readonly></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
+    </div>
+    <el-dialog title="提示" :visible.sync="flag" @open="()=>{
+      this.$refs.dialogInput.focus();
+    }" @close="()=>{
+      this.number = 1
+    }" width="15vw" top="30vh">
+      <el-form label-position="top" class="title">
+        <el-form-item label="零数量">
+          <el-input-number size="medium" style="width: 100%;text-align: left" :controls="false" ref="dialogInput" :min="1" v-model="number" @keyup.enter.native="selectBySeqNo"></el-input-number>
+        </el-form-item>
+      </el-form>
+      <div style="height: 20px;width: 100%"></div>
+      <div style="text-align: center;margin-bottom: 5px">
+        <el-button type="primary" @click="printLabelEntity">确定</el-button>
+      </div>
+      <div style="height: 5px;width: 100%"></div>
+    </el-dialog>
+  </div>
+</template>
+
+<style scoped>
+.title .el-input-number /deep/ .el-input__inner{
+  text-align: left;
+  margin-top: 5px;
+  padding-right: 5px !important;
+  padding-left: 5px !important;
+}
+
+.el-form-item--medium /deep/ .el-form-item__label{
+  font-size: 16px;
+  line-height: 30px;
+  height: 30px;
+}
+
+.el-form-item--medium /deep/ .el-form-item__content{
+  margin-bottom: 5px;
+}
+
+.el-form-item--medium /deep/ .el-form-item__content .el-button{
+  width: 80px;
+  height: 30px;
+}
+
+.el-form-item--medium /deep/ .el-form-item__content .el-input .el-input__inner{
+  font-size: 16px;
+  line-height: 30px;
+  height: 30px !important;
+}
+</style>