Merge remote-tracking branch 'origin/master'

zss

2023-09-14 4c5c20a7c03539104df74072b1b8a81b51c19ab8

 src/components/view/Processingproducts.vue

@@ -74,12 +74,12 @@
        >
          <el-table-column type="selection" min-width="50"> </el-table-column>
          <el-table-column type="index" label="序号" width="60">
            <template scope="scope">
            <template slot-scope="scope">
              {{ (search.pageSize - 1) * search.countSize + scope.$index + 1 }}
            </template>
          </el-table-column>
          <el-table-column prop="dateArrival" label="产品大类">
            <template scope="scope">
            <template slot-scope="scope">
              <span v-if="scope.row.type == 0">原材料</span>
              <span v-if="scope.row.type == 1">成品</span>
              <span v-if="scope.row.type == 2">半成品</span>
@@ -97,7 +97,7 @@
          <el-table-column prop="number" label="不合格品数量">
          </el-table-column>
          <el-table-column label="现像描述" min-width="150">
            <template scope="scope">
            <template slot-scope="scope">
              <el-input
                size="small"
                v-model="scope.row.description"
@@ -106,7 +106,7 @@
            </template>
          </el-table-column>
          <el-table-column label="处置意见">
            <template scope="scope">
            <template slot-scope="scope">
              <el-button type="text" @click="showDisposalOpinions(scope)"
                >查看处置意见</el-button
              >
@@ -125,7 +125,7 @@
            </template>
          </el-table-column>
          <el-table-column label="操作" width="130">
            <template scope="scope">
            <template slot-scope="scope">
              <div style="display: flex;">
                <el-button type="text" siae="small" size="mini">附件</el-button>
                <el-button
@@ -157,7 +157,11 @@
      </el-card>
    </div>
    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
      <el-form label-width="130px">
      <el-form label-width="130px" style="height: 500px; overflow: auto ;">
        <el-empty
          v-if="updateEditList.length == 0"
          :image-size="200"
        ></el-empty>
        <div v-for="item in updateEditList" :key="item.$index">
          <el-form-item
            :label="
@@ -312,9 +316,13 @@
    // 点击确定按钮
    updateEditDevided() {
      this.$axios
        .post(this.$api.url.addOpinion, this.updateEditList, {
          headers: { "Content-Type": "application/json" }
        })
        .post(
          this.$api.url.addOpinion,
          { opinion: this.updateEditList },
          {
            headers: { "Content-Type": "application/json" }
          }
        )
        .then(res => {
          console.log(`output->res`, res);
          this.dialogVisible = false;