Merge remote-tracking branch 'origin/master'

zss

2023-12-12 6371e0890178fe1fdd9c36f72373a141add90d92

Merge remote-tracking branch 'origin/master'

 src/views/common/documentDetail.vue

@@ -52,7 +52,7 @@
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="4">
              <!-- <el-col :span="4">
                <el-form-item label="项目类别" prop="projectType">
                  <el-select
                    v-model="dataForm.projectType"
@@ -74,7 +74,7 @@
                <el-form-item label="国家" prop="country">
                  <countrySelector v-model="dataForm.country"></countrySelector>
                </el-form-item>
              </el-col>
              </el-col> -->
            </el-row>
            <el-row>
              <el-col :span="5">
@@ -374,7 +374,7 @@
                </el-collapse>
              </el-card>
            </el-tab-pane>
            <el-tab-pane label="图片上传" style="height: 100%">
            <!-- <el-tab-pane label="图片上传" style="height: 100%">
              <el-card class="document-structure">
                <div slot="header">
                  <span>结构图</span>
@@ -440,7 +440,7 @@
                  <img width="100%" :src="dialogFlowImageUrl" alt="" />
                </el-dialog>
              </el-card>
            </el-tab-pane>
            </el-tab-pane> -->
          </el-tabs>
        </div>
      </div>

 src/views/plan/manufacturingorder/index.vue

@@ -211,6 +211,10 @@
            <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
                  <el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
                  <el-row>
                    <el-col :span="10" :offset="3">批次号</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
                  </el-row>
                  <el-row>
                    <el-col :span="10" :offset="3">订单号：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
                  </el-row>
@@ -239,25 +243,29 @@
    </el-dialog>
    <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;padding: 0;">
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-bottom:10px;font-size: 16px !important;">
            <el-row>
                    <el-col :span="10" :offset="3">订单号：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.customerOrderNo }}</el-col>
                  </el-row>
                  <el-row>
                    <el-col :span="10" :offset="3">客户名称：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
                  </el-row>
                  <el-row>
                    <el-col :span="10" :offset="3">零件名称：</el-col>
                    <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
                  </el-row>
              <el-row>
                <el-col :span="10" :offset="3">订单二维码：</el-col>
                <el-col :span="10">
                  <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
                </el-col>
              </el-row>
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="padding-top:0px;margin-bottom:10px;font-size: 16px !important;">
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">批次号</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
            </el-row>
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">订单号：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
            </el-row>
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">客户名称：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
            </el-row>
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">零件名称：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
            </el-row>
            <el-row style="font-size:12px;">
              <el-col :span="10" :offset="3">订单二维码：</el-col>
              <el-col :span="10">
                <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
              </el-col>
            </el-row>
          </el-card>
        </div>
      </div>

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

@@ -160,6 +160,20 @@
        </el-row>
      </div>
    </div>
    <el-dialog
      title="提示"
      :visible.sync="dialogVisible"
      width="30%">
      <el-form :model="submitData" ref="form" label-width="100px" >
        <el-form-item label="请输入行号" prop="lineNo" :rules="{required:true,message:'行号不能为空',trigger:'blur'}">
          <el-input v-model="submitData.lineNo" />
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="dialogVisible = false">取 消</el-button>
        <el-button type="primary" @click="confirmSubmit(submitData,false)">确 定</el-button>
      </span>
    </el-dialog>
  </div>
</template>

@@ -176,6 +190,12 @@
    },
    data(){
        return{
            submitData: {
              id:null,
              result: null,
              lineNo: null,
            },
            dialogVisible: false,
            loading: false,
            resultVal: null,
            dataForm:{
@@ -223,6 +243,11 @@
      this.init()
    },
    watch:{
      dialogVisible(newVal){
        if(!newVal){
          this.$refs.form.resetFields();
        }
      }
    },
    methods:{
      changeResult(){
@@ -250,39 +275,41 @@
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          this.checkCustomer(_than.dataForm.id)
        }).catch(() => {})
      },
      checkCustomer(id){
        const _than = this
        if(id){
          getCustomer(id).then(res=>{
          _than.submitData.id = _than.dataForm.id,
          _than.submitData.result = _than.conclusionTable[0].result,
          getCustomer(_than.dataForm.id).then(res=>{
            if(res.status===200){
              console.log(res.data);
              _than.confirmSubmit(_than.submitData,true)
            }
          }).catch(error=>{
            this.$prompt('请输入行号', '提示', {
              confirmButtonText: '确定',
              cancelButtonText: '取消',
              inputPattern: /\S/,
              inputErrorMessage: '行号不能为空'
            }).then(({ value }) => {
              let data = {
                id: _than.dataForm.id,
                result: _than.conclusionTable[0].result,
                lineNo: value
              }
              updatePackageInspectById(data).then(res => {
                if(res.data.code === 0){
                  _than.resultVal = res.data.data
                  sessionStorage.setItem("packIns-resultVal-"+_than.dataForm.id,res.data.data)
                  _than.$message.success("上报成功");
                }else{
                  _than.$message.error("上报失败",res.data.data);
                }
              })
            }).catch(() => {
            })
            console.log("输入行号");
            _than.dialogVisible = true
          })

        }).catch(() => {})
      },
      confirmSubmit(data,isOtc){
        const _than = this
        let isSubmit = false
        if(isOtc){
          isSubmit = true
        }else{
          _than.$refs.form.validate(valid=>{
            if(valid){
              isSubmit = true
              _than.dialogVisible = false
            }
          })
        }
        if(isSubmit){
          updatePackageInspectById(data).then(res => {
            if(res.data.code === 0){
              _than.resultVal = res.data.data
              sessionStorage.setItem("packIns-resultVal-"+_than.dataForm.id,res.data.data)
              _than.$message.success("上报成功");
            }else{
              _than.$message.error("上报失败",res.data.data);
            }
          })
        }
      },

 src/views/technology/document/teststandard.vue

@@ -184,7 +184,9 @@
  computed: {
    ...mapGetters(['permissions'])
  },
  created() {},
  created() {
    getTestStand(this.paramObj)
  },
  methods: {
    // 获取数据列表
    getData() {