Merge remote-tracking branch 'origin/qingban' into qingban

src/views/pro-operation/remove/index.vue

@@ -14,14 +14,15 @@
           <el-table-column label="状态" prop="state">
             <template #default="scope">
               <span v-if="scope.row.state == '0'">待处理</span>
-              <span v-else-if="scope.row.state == '1'">审核中</span>
-              <span v-else-if="scope.row.state == '2'">审核驳回</span>
-              <span v-else-if="scope.row.state == '3'">审核完成</span>
+              <span v-else-if="scope.row.state == '1'">已完成</span>
+              <span v-else-if="scope.row.state == '-1'">审核驳回</span>
+              <span v-else-if="scope.row.state == '3'">审核中</span>
+              <span v-else-if="scope.row.state == '2'">撤销</span>
             </template>
           </el-table-column>
           <el-table-column label="操作">
             <template #default="{ row }">
-              <el-button v-if="row.state == '0'" link type="danger" @click="del(row.id)" style="font-size: 20px"
+              <el-button v-if="row.state != '1'&&row.state!=3" link type="danger" @click="del(row.id)" style="font-size: 20px"
                 >删除</el-button
               >
             </template>
@@ -125,7 +126,7 @@
                 value-format="YYYY-MM-DD"
               />
             </el-form-item>
-            <el-form-item
+<!--            <el-form-item
               label="指定检验人"
               prop="remark2[user2]"
               :rules="{
@@ -141,7 +142,7 @@
                 filterable
                 clearable
               />
-            </el-form-item>
+            </el-form-item>-->
           </el-form>
         </el-scrollbar>
         <div class="btns">

src/views/pro-operation/rework/index.vue

@@ -23,6 +23,15 @@
           <el-table-column label="数量" prop="num" />
           <el-table-column label="返工原因" prop="reason" />
           <el-table-column label="返工内容" prop="remark" />
+          <el-table-column label="状态" prop="flowState">
+            <template #default="scope">
+              <span v-if="scope.row.flowState == '0'">待处理</span>
+              <span v-else-if="scope.row.flowState == '1'">已完成</span>
+              <span v-else-if="scope.row.flowStatee == '-1'">审核驳回</span>
+              <span v-else-if="scope.row.flowState == '3'">审核中</span>
+              <span v-else-if="scope.row.flowState == '2'">撤销</span>
+            </template>
+          </el-table-column>
         </el-table>
         <Pagination
           v-model:limit="limit"

src/views/traceability/components/materials.vue

@@ -13,7 +13,7 @@
 <!--            <el-table-column prop="itemSeq" label="采集编码" />-->
             <el-table-column prop="batchNo" label="批次号" />
             <el-table-column prop="seqNo" label="管号" />
-            <el-table-column v-if="value==='host'" prop="replaceBatchNo" label="替换批次号" />
+            <el-table-column v-if="value==='host'" prop="oldBatchNo" label="原批次号" />
             <el-table-column v-if="value==='host'" prop="needNum" label="需求数量" />
             <el-table-column v-if="value==='host'" prop="realNum" label="已采集数量" />
           </el-table>