倒冲料发布

common/http.api.js

@@ -201,8 +201,8 @@ const install = (Vue, vm) => {
 
       //查询反冲料列表
       recoilMaterialList: (params = {}) =>
-        vm.$u.post(
-          config.adminPath + '/mobile/pro/proMaterial/getRecoilMaterial',
+        vm.$u.get(
+          config.adminPath + '/pro/recoilMaterial/getRecoilMaterialList',
           params
         ),
       //增加反冲料

pages/mes/prodReport/index.vue

@@ -86,6 +86,8 @@
         <u-button type="success" @click="commonClick('Prod')">生产报工</u-button>
         <u-button type="primary" @click="commonClick('FinshTask')">完成作业</u-button>
         <u-button type="primary" @click="commonClick('KnifeTemp')">刀模版上下机</u-button>
+        <!-- <u-button type="primary" @click="commonClick('KnifeTemp2')">刀模版上下机2</u-button> -->
+
         <u-button type="primary" @click="commonClick('FeedingInspection')">投料校验</u-button>
         <u-button type="primary" @click="commonClick('RecoilMaterial')">反冲料登记</u-button>
         <u-button type="primary" @click="commonClick('MaterialRequest')">领料申请</u-button>
@@ -369,15 +371,18 @@
                     </u-form-item>
                   </u-col>
                   <u-col span="6">
-                    <u-form-item label="合格数量(副):" prop="feedbackQuantityFu">
+                    <u-form-item class="column-type" label-width="100px" label="合格数量(副):" prop="feedbackQuantityFu">
+                      <view class="button-type2">
                         <u-number-box :min="0"
                           @change="quantityChangedV2(feedback, feedbackQuantityFu, feedbackUnQuantityFu)"
                           v-model="feedbackQuantityFu"></u-number-box>
+                      </view>
+
                     </u-form-item>
                   </u-col>
                   <u-col span="6">
-                    <u-form-item label="不良品数量(副):" prop="feedbackUnQuantityFu">
-                      <u-number-box :min="0"
+                    <u-form-item class="column-type" label-width="100px" label="不良品数量(副):" prop="feedbackUnQuantityFu">
+                      <u-number-box :min="0" align="right"
                         @change="quantityChangedV2(feedback, feedbackQuantityFu, feedbackUnQuantityFu)"
                         v-model="feedbackUnQuantityFu"></u-number-box>
                     </u-form-item>
@@ -432,6 +437,11 @@
       </view>
     </u-modal>
 
+    <!-- <u-modal title="刀模版上下机2" v-model="timeTest.isshow" :title-style="{ color: 'red' }">
+      <view>
+        1
+      </view>
+    </u-modal> -->
     <u-modal title="刀模版上下机" show-cancel-button :show-confirm-button="!!knifeTempType"
       @confirm="handleSubmitConfirmlKnifeTemp" @cancel="handleSubmitCancelKnifeTemp" :confirmText="knifeTempCancelText"
       :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
@@ -570,21 +580,42 @@
           <scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
             <uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据">
               <uni-tr>
-                <uni-th width="100px" align="center">操作</uni-th>
+                <!-- <uni-th width="200px" align="center">操作</uni-th> -->
                 <uni-th width="110px" align="center">产品物料编码</uni-th>
                 <uni-th width="300px" align="center">产品物料名称</uni-th>
                 <uni-th width="110px" align="center">批次号</uni-th>
+                <uni-th width="110px" align="center">需求数量</uni-th>
+                <uni-th width="110px" align="center">数量</uni-th>
+
               </uni-tr>
-              <uni-tr v-for="(line, index) in recoilMaterialList" :key="index">
-                <uni-td align="center">
+              <uni-tr v-for="(line, index) in recoilMaterialDetailList" :key="index">
+                <!-- <uni-td align="center">
                   <view class="uni-group">
                     <button class="uni-button" size="mini" type="primary"
-                      @click="recoilMaterialDelete(line)">删除</button>
+                    @click="materialRequestFormShow(line)">补料</button>
+                    <button class="uni-button button-type" size="mini" style="background-color:green;color:white;" 
+                      @click="recoilMaterialDelete(line)" disabled="true">删除</button>
+                     <button class="uni-button button-type" size="mini"  type="primary"
+                      @click="recoilMaterialDelete(line)"  disabled="true">检查</button> 
                   </view>
-                </uni-td>
-                <uni-td align="center">{{ line.itemCode }}</uni-td>
+
+                </uni-td> -->
+
+
+                <uni-td align="center">{{ line.sapItemCode }}</uni-td>
                 <uni-td align="center">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td>
-                <uni-td align="center">{{ line.batchNo }}</uni-td>
+                <uni-td align="center">
+                  <view class="uni-group">
+                    <button class="uni-button button-type column-type" size="mini"
+                      @click="batchShow(line)">查看倒冲批次</button>
+                  </view>
+
+                </uni-td>
+
+                <uni-td align="center">{{ line.requestSum }}</uni-td>
+                <uni-td align="center">{{ line.sum }}</uni-td>
+
+
               </uni-tr>
             </uni-table>
           </scroll-view>
@@ -759,6 +790,13 @@
         <zb-table :columns="tableDetailColumn" :stripe="true" :border="true" :data="tableDataDetail"></zb-table>
       </view>
     </u-modal>
+    <u-modal title="查看倒冲批次" :showRecoilMaterialButton="true"
+      :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
+      v-model="recoilMaterialFlag" width="1300rpx">
+      <view>
+        <zb-table :columns="recoilMaterialColumn" :stripe="true" :border="true" :data="recoilMaterialList"></zb-table>
+      </view>
+    </u-modal>
     <!-- //查询图片生产工单 -->
     <u-modal title="生产工单" show-cancel-button :show-confirm-button="false" cancel-text="返回"
       :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
@@ -1271,7 +1309,7 @@ export default {
       stockInVisible: false,
       material: false,
       feedingInspectionList: [],
-      recoilMaterialList: [],
+      recoilMaterialDetailList: [],
       materialRequestList: [],
       materialRequestArrays: [],
       materialRequests: [],
@@ -1298,6 +1336,34 @@ export default {
       userTempVisible: false,
       materialReturnFormVisible: false,
       materialReturnSelected: {},
+      recoilMaterialColumn: [
+        {
+          name: 'sapItemCode',
+          label: 'sap物料号',
+          width: 200
+        },
+        {
+          name: 'batchNo',
+          label: '批次号',
+          width: 100
+        },
+        {
+          name: 'packNo',
+          label: '卷号',
+          width: 100
+        },
+        {
+          name: 'quantity',
+          label: '数量',
+          width: 100
+        },
+        {
+          name: 'createTime',
+          label: '创建时间',
+          width: 100
+        }
+      ],
+
       tableDetailColumn: [
         {
           name: 'workorderCode',
@@ -1326,7 +1392,11 @@ export default {
         }
       ],
       tableDataDetail: [],
+      recoilMaterialList: [],
+
       showRowDeatilFlag: false,
+      recoilMaterialFlag: false,
+
       loading: false,
       copyFeedBackForms: [],
       timeTest: {
@@ -1520,6 +1590,9 @@ export default {
         case 'KnifeTemp':
           this.knifeTempShow();
           break;
+        case 'KnifeTemp2':
+          this.changeShow();
+          break;
         case 'abnormal':
           this.doException();
           break;
@@ -1550,6 +1623,7 @@ export default {
           break;
       }
     },
+
     handleJobAssignment() {
       this.jobAssignmentForm = {
         quantity: 1,
@@ -2459,9 +2533,9 @@ export default {
     recoilMaterialLoadAndScan(bool) {
       const t = this;
       const taskInfo = this.tableSelectData[0];
-      this.$u.api.recoilMaterialList({ taskId: taskInfo.taskId }).then((res) => {
+      this.$u.api.recoilMaterialList({ taskId: taskInfo.taskId, processId: taskInfo.processId }).then((res) => {
         if (res.code === 200) {
-          t.recoilMaterialList = res.data;
+          t.recoilMaterialDetailList = res.data;
           if (bool) {
             t.$u.toast('保存成功');
           }
@@ -2480,14 +2554,20 @@ export default {
     recoilMaterialDelete(line) {
       const t = this;
       const taskInfo = this.tableSelectData[0];
-      this.$u.api.deleteRecoilMaterial({ id: line.recoilMaterialId }).then((res2) => {
-        t.$u.api.recoilMaterialList({ taskId: taskInfo.taskId }).then((res) => {
+      this.$u.api.deleteRecoilMaterial({ id: line.id }).then((res2) => {
+        t.$u.api.recoilMaterialList({ taskId: taskInfo.taskId, processId: taskInfo.processId }).then((res) => {
           if (res.code === 200) {
             t.recoilMaterialList = res.data;
           }
         });
       });
     },
+
+    batchShow(row) {
+      this.recoilMaterialList = row.proRecoilMaterialList;
+      this.recoilMaterialFlag = true;
+    },
+
     materialRequestShow() {
       this.materialRequestVisible = true;
       const taskInfo = this.tableSelectData[0];

static/css/amebase.css

 .auto-size-button {
-    width: max-content; /* 根据内容自动调整宽度 */
-    padding: 10px; /* 按钮内间距 */
-    border: none; /* 无边框 */
-    background-color: #007BFF; /* 背景颜色 */
-    color: white; /* 文本颜色 */
-    cursor: pointer; /* 鼠标悬停时显示指针 */
-    font-size: 16px; /* 文本大小 */
-    border-radius: 5px; /* 边框圆角 */
-  }
-   
-  .auto-size-button:hover {
-    background-color: #0056b3; /* 鼠标悬停时的背景颜色 */
-  }
-
-
-  .u-col1 label {
+  width: max-content;
+  /* 根据内容自动调整宽度 */
+  padding: 10px;
+  /* 按钮内间距 */
+  border: none;
+  /* 无边框 */
+  background-color: #007BFF;
+  /* 背景颜色 */
+  color: white;
+  /* 文本颜色 */
+  cursor: pointer;
+  /* 鼠标悬停时显示指针 */
+  font-size: 16px;
+  /* 文本大小 */
+  border-radius: 5px;
+  /* 边框圆角 */
+}
+
+.auto-size-button:hover {
+  background-color: #0056b3;
+  /* 鼠标悬停时的背景颜色 */
+}
+
+
+.u-col1 label {
   white-space: nowrap;
   /* white-space: normal; 默认，空白会被浏览器忽略，文本会在达到元素宽度后自动换行 */
   /* word-break: break-all; 如果需要在任意字符间断开，可以使用这个属性 */
   /* word-wrap: break-word; 允许在长单词或URL地址内部换行 */
 
-  }
+}
+
+
+.button-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  /* 这会在按钮之间增加等间距 */
+  align-items: center;
+  padding: 10px;
+  /* 这是按钮容器的内填充，可以调整间距 */
+}
+
+
+.column-type {
+  display: inline-block;
+  /* 或者 display: table; */
+  width: auto;
+  /* 确保宽度自适应 */
+  white-space: nowrap;
+  /* 不换行 */
+
+  /* 其他样式 */
+}
+
+.button-type {
+  margin: 10px;
+  /* 这是按钮之间的外间距，可以调整 */
+  /* padding: 10px; */
+  /* 按钮内的填充，可以调整 */
+  /* background: #007AFF; */
+  /* color-scheme: #0056b3 ; */
+  /* color: #14cbec; */
+}
+
+
+.button-type2 {
+  margin-right: 50px;
+  /* 按钮内的填充，可以调整 */
+
+}
+
+
+
+
+
+.number-box-type {
+  display: flex;
+  align-items: center;
+  /* 垂直居中 */
+  justify-content: flex-start;
+  /* 水平左对齐 */
+}
\ No newline at end of file