zouyu
2024-01-04 2788beeb20d8056da56f31662b4257824b385788
包装台账修改
已修改3个文件
38 ■■■■■ 文件已修改
src/views/product/workbench/index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/Packaging_ledger/index.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/packageinspect/packageInspect-form.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/product/workbench/index.vue
@@ -531,7 +531,7 @@
          <!--  :style="{ backgroundColor: taskStatusColor() }" -->
          <div class="task-div-content" >
    <div v-if="!isShowNormalTracking" class="task-list-div" >
      <operationTaskPane
      <operationTaskPane
        ref="operateTaskDiv"
        :workstationId="dutyForm.workstationId"
        :productSn="operateTaskForm.SN"
@@ -734,7 +734,6 @@
    <staffDialog
      :currshowlist.sync="showStaff"
      :selCol="selCol"
      :selColValArr="selColValArr"
      :multiSelect="true"
      :dutyRecord="dutyForm"
      @handleSelectionChange="selectStaff"
@@ -2378,10 +2377,10 @@
      } else if (this.status) {
        this.$message.warning('该班次已经确认,不可修改')
      } else {
        this.selCol = 'staffNo'
        for (let i = 0; i < this.personBoardList.length; i++) {
          this.selColValArr.push(this.personBoardList[i].staffNo)
        }
        // this.selCol = 'staffNo'
        // for (let i = 0; i < this.personBoardList.length; i++) {
        //   this.selColValArr.push(this.personBoardList[i].staffNo)
        // }
        this.showStaff = true
      }
    },
src/views/quality/Packaging_ledger/index.vue
@@ -8,7 +8,7 @@
            :isShowHide="true"
            :prelang="prelang"
            :ajaxFun="ajaxFun"
            :options="options"
            :options="options"
            @handleSelectionChange="handleSelectionChange"
            ref="processconfiguration"
            >
@@ -55,7 +55,7 @@
              :data="testStandardParams"
              id="testStandardParamTable"
              ref="testStandardParam"
              highlight-current-row
              height="700"
              style="width: 100%"
@@ -145,7 +145,7 @@
                <el-col :span="10" :offset="3">序号:</el-col>
                <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
              </el-row>
              <el-row>
              <el-row>
                <el-col :span="10" :offset="3">包装编号:</el-col>
                <el-col :span="10" style="font-weight: bold;">{{ item.packageNo }}</el-col>
              </el-row>
@@ -312,7 +312,14 @@
              icon: 'el-icon-position',
              type: 'text',
              size: 'small',
              fun: this.check
              fun: this.check,
              show: {
                val: [
                    '草稿',
                    '未报检',
                ],
                key: 'state'
              }
            })
      }
      if(this.permissions.quality_packaging_ledger_del){
@@ -344,7 +351,7 @@
              printable: 'qrCard',//页面
              type: "html",//文档类型
                maxWidth:450,
                targetStyles:['*'],
                targetStyles:['*'],
                style: `@page {
                  margin:0;
                  padding: 0;
@@ -468,4 +475,4 @@
      },
    },
}
</script>
</script>
src/views/quality/packageinspect/packageInspect-form.vue
@@ -202,7 +202,7 @@
    },
    data(){
        return{
            isShow: true,
            isShow: false,
            submitData: {
              id:null,
              result: null,
@@ -462,9 +462,9 @@
                    _than.list.push(ele)
                }
              })
              let find1 = _than.list.find(ele=>ele.name===inspect1[0].name) !=undefined;
              let find2 = _than.list.find(ele=>ele.name===inspect2[0].name) !=undefined;
              _than.isShow = find1||find2
              let find1 = this.list.find(ele=>ele.name===inspect1[0].name&&ele.isEdit) !=undefined;
              let find2 = this.list.find(ele=>ele.name===inspect2[0].name&&ele.isEdit) !=undefined;
              this.isShow = find1||find2
              _than.conclusionTable = [{
                packageNo: data.packageNo,
                userName: Array.from(new Set(userNameList)).join(','),