包装台账修改

王震

2024-01-12 4db7bd40aa774870c8fb73e5bfc41514ec662923

包装台账修改

 src/const/defaultPackageInspect.js

ÎļþÒÑɾ³ý

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -154,6 +154,14 @@
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="10">
              <el-form-item label="工艺文件" prop="technologyDocumentName">
                 <el-tooltip class="item" effect="dark" :content="dataForm.technologyDocumentName">
                  <el-input v-model="dataForm.technologyDocumentName" placeholder="">
                </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>
            <!-- <el-col
              :span="2"
@@ -1193,7 +1201,9 @@
        endDate: null,
        manufactureAttr: 'N',
        isReportOperation: false,
        outPutBatchList: []
        outPutBatchList: [],
        technologyDocumentId: null,
        technologyDocumentName: null,
      },
      currentRow: [],
      currentRouting: {}, // å½“前选择的工艺
@@ -1204,6 +1214,9 @@
      operationTemplateList: [], // å‚数集
      templateParamList: [], // å‚æ•°
      dataRule: {
        technologyDocumentName:[
          { required: true, message: '工艺文件不能为空', trigger: 'blur' }
        ],
        workshopTypeCode: [
          { required: true, message: '车间订单类型不能为空', trigger: 'blur' }
        ],
@@ -1522,13 +1535,7 @@
      checkPart(value, this.dataForm.workshopTypeCode)
        .then((response) => {
          const manufacturingOrderDTO = response.data.data
          /* this.dataForm.routingList = manufacturingOrderDTO.routingList.filter(
            (e) => e.bomTypeDb === this.dataForm.workshopTypeCode
          ) */
          this.dataForm.routingList = manufacturingOrderDTO.routingList
          /* this.dataForm.bomList = manufacturingOrderDTO.bomList.filter(
            (e) => e.bomTypeDb === this.dataForm.workshopTypeCode
          ) */
          this.dataForm.bomList = manufacturingOrderDTO.bomList
          this.dataForm.technologyRoutingId =
            manufacturingOrderDTO.technologyRoutingId
@@ -1664,10 +1671,13 @@
      this.showRouting = true
    },
    selectRouting(param) {
      console.log(param);
      if (param) {
        this.dataForm.partNo = param.partNo
        this.dataForm.partName = param.partName
        this.dataForm.partId = param.partId
        this.dataForm.technologyDocumentId = param.id
        this.dataForm.technologyDocumentName = param.name
        this.$refs.dataForm.validateField('partId', (valid) => {})
      }
    },
@@ -1687,6 +1697,8 @@
      })
    },
    // 2.tabs-工艺路线
    //工艺文件选择
    
    // å·¥è‰ºè·¯çº¿é€‰æ‹©
    routingSelectChanged(routingId) {
      this.currentRouting = this.dataForm.routingList.find(

 src/views/plan/manufacturingorder/routing.vue

@@ -31,7 +31,7 @@
  </el-dialog>
</template>
<script>
import { fetchList } from '@/api/technology/routing'
import { fetchList } from '@/api/technology/document'
import ttable from '@/views/common/ztt-table.vue'
import { remote } from '@/api/admin/dict'
export default {
@@ -73,12 +73,12 @@
        border: true, // æ˜¯å¦æœ‰çºµå‘边框
        lazy: false, // æ˜¯å¦éœ€è¦æ‡’加载
        fit: true, // åˆ—的宽度是否自撑开
        multiSelect: false, //
        multiSelect: true, //
        seqNo: true,
        isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
        isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
        isSearch: false, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
        defaultOrderBy: { column: 'updateTime', direction: 'desc' }
        isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®H
        isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
        defaultOrderBy: { column: 'createTime', direction: 'desc' }
      },
      table: {
        total: 0,
@@ -89,62 +89,62 @@
        column: [
          {
            minWidth: '100',
            prop: 'routingNo',
            label: '工艺编号',
            prop: 'number',
            label: '文件编号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'name',
            label: '文件名称',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // å·¥è‰ºç±»åž‹
          // {
          //   minWidth: '120',
          //   prop: 'bomTypeDb',
          //   label: '工艺类型',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: false,
          //   searchInfoType: 'select',
          //   formatter: this.formatBomTypeDbType,
          //   optList: () => {
          //     return this.bomTypeDbOptions
          //   }
          // },
          // {
          //   minWidth: '100',
          //   prop: 'name',
          //   label: '工艺名称',
          //   prop: 'master',
          //   label: '主工艺',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          //   searchInfoType: 'select',
          //   formatter: this.getMaster,
          //   optList: () => {
          //     return this.getMasterList()
          //   }
          // },
          // å·¥è‰ºç±»åž‹
          {
            minWidth: '120',
            prop: 'bomTypeDb',
            label: '工艺类型',
            sort: true,
            isTrue: true,
            isSearch: false,
            searchInfoType: 'select',
            formatter: this.formatBomTypeDbType,
            optList: () => {
              return this.bomTypeDbOptions
            }
          },
          {
            minWidth: '100',
            prop: 'master',
            label: '主工艺',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            formatter: this.getMaster,
            optList: () => {
              return this.getMasterList()
            }
          },
          {
            minWidth: '100',
            prop: 'state',
            label: '状态',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            formatter: this.getMasterState,
            optList: () => {
              return this.getMasterStateList()
            }
          },
          // {
          //   minWidth: '100',
          //   prop: 'state',
          //   label: '状态',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'select',
          //   formatter: this.getMasterState,
          //   optList: () => {
          //     return this.getMasterStateList()
          //   }
          // },
          {
            minWidth: '100',
            prop: 'description',
@@ -154,16 +154,16 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'partName',
            label: '零件名',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',
            noShowTip: false
          },
          // {
          //   minWidth: '120',
          //   prop: 'partName',
          //   label: '零件名',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text',
          //   noShowTip: false
          // },
          {
            minWidth: '120',
            prop: 'partNo',
@@ -202,7 +202,7 @@
          label: '草稿'
        },
        {
          value: '02accepted',
          value: '02pending',
          label: '已接受'
        },
        {
@@ -285,7 +285,7 @@
    currshowlist() {
      this.innerVisible = this.currshowlist
      if (this.currshowlist) {
        this.queryParam.state = '02accepted'
        this.queryParam.state = '03accepted'
        this.$nextTick(() => {
          this.getData()
        })

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -349,7 +349,7 @@
        }
      },
      codeDevice(row,index){
        this.row=row 
        this.row=row
        console.log("row",row);
        this.deviceCode =true
        this.$refs.codeDeviceCompont.openCamera()
@@ -440,6 +440,7 @@
                    this.processInspectVo.documentId = result.documentId
                    this.processInspectVo.outBatchNo = result.outBatchNo
                    this.processInspectVo.locName = result.locName
                    this.processInspectVo.productNo = result.productNo
                    let userList = []
                    result.children.forEach(item=>{
                        item.iid = Math.random()
@@ -626,7 +627,7 @@
                                updateFinishedInsProduct(obj).then(res => {
                                    if (res.data.code == 0) {
                                        this.init()
                                    } 
                                    }
                                })
                            }
                        })

 src/views/quality/finishedProductInspection/index.vue

@@ -108,7 +108,6 @@
                    },
                    {
                        minWidth: '130',
                        width: '150',
                        prop: 'projectName',
                        label: '工程名称',
                        sort: true,
@@ -134,8 +133,9 @@
                    },
                    {
                        minWidth: '120',
                        width: '150',
                        prop: 'material',
                        label: '产品大类',
                        label: '产品名称',
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'text'

 src/views/quality/packageInspectTemplate/inspect-detail.vue

@@ -14,6 +14,20 @@
        @row-save="addInspectHandler"
        @row-del="delInspectHandler"
        :page="page">
            <template slot="inspectNameForm" slot-scope="scope">
                <el-input
                placeholder="请输入检验项目名称"
                type="textarea"
                v-model="scope.row.inspectName"
                :rows="2" />
            </template>
            <template slot="inspectRequiredForm" slot-scope="scope">
                <el-input
                placeholder="请输入检验标准"
                type="textarea"
                v-model="scope.row.inspectRequired"
                :rows="2" />
            </template>
            <template #menu="{size,row,index}">
                <el-button v-if="row.children!=null" class="menu-button" :size="size" @click="addChildren(size,row,index)" type="text" icon="el-icon-circle-plus-outline">添加子项目</el-button>
                <el-button v-if="row.children==null" class="menu-button" :size="size" @click="showUpdateDialog(size,row,index)" type="text" icon="el-icon-edit">编辑</el-button>
@@ -71,7 +85,7 @@
        </el-form>
        <span slot="footer" class="dialog-footer">
            <el-button @click="addChildrenVisible = false">取 æ¶ˆ</el-button>
            <el-button type="primary" @click="addInspectHandler">ç¡® å®š</el-button>
            <el-button type="primary" @click="addChildrenHandler">ç¡® å®š</el-button>
        </span>
    </el-dialog>
</div>
@@ -164,9 +178,24 @@
    },
    methods:{
        addChildren(size,row,index){
            console.log(row);
            this.addChildrenForm.inspectName = row.inspectName
            this.addChildrenVisible = true
        },
        addInspectHandler(row,done,loading){
            const _than = this
            let obj = {
                parentId: this.paramObj.id,
                ...row
            }
            addInspect(obj).then(res=>{
                if(res.status===200){
                    _than.getData()
                    _than.$message.success("添加成功")
                }
            }).catch(error=>{
                console.error(error)
            })
            done()
        },
        delInspectHandler(size,row,index){
            const _than = this
@@ -208,7 +237,7 @@
                }
            })
        },
        addInspectHandler(){
        addChildrenHandler(){
            const _than = this
            this.$refs.addChildrenForm.validate(valid=>{
                if(valid){

 src/views/quality/packageinspect/packageInspect-form.vue

@@ -66,7 +66,7 @@
        <el-row :gutter="10" style="width:100%;z-index: 10;height:30px;">
            <el-col :span="12">检验项目</el-col>
            <el-col :span="12" style="text-align: right;">
                <el-dropdown @command="handleCommand" v-if="!isShow && resultVal==null">
                <el-dropdown @command="handleCommand" v-if="isShow">
                    <el-button size="mini" style="margin-right: 10px;" type="primary" >
                        åˆ‡æ¢æ£€éªŒé¡¹æ¨¡æ¿<i class="el-icon-arrow-down el-icon--right"></i>
                    </el-button>
@@ -195,7 +195,6 @@
  getCustomer,
} from '@/api/quality/packageInspect'
import {getAllTemplateByEnable} from '@/api/quality/packageInspectTemp'
import {inspect1,inspect2} from '@/const/defaultPackageInspect'
export default {
    computed:{
    },
@@ -204,7 +203,7 @@
    data(){
        return{
            inspectMoulds: [],
            isShow: false,
            isShow: true,
            submitData: {
              id:null,
              result: null,

 src/views/quality/processInspect/index.vue

@@ -90,7 +90,6 @@
                        },
                        {
                            minWidth: '130',
                            width: '150',
                            prop: 'specs',
                            label: '规格型号',
                            sort: true,