55

src/views/InTheSystem/components/search.vue

@@ -4,20 +4,20 @@
       <el-row :gutter="15">
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
               <el-form-item label="工单编码:">
-                  <el-input clearable v-model="where.workOrderCode" placeholder="请输入" />
+                  <el-input  size="mini" clearable v-model="where.workOrderCode" placeholder="请输入" />
               </el-form-item>
           </el-col>
 
 
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
               <el-form-item label="物品名称:">
-                  <el-input clearable v-model="where.categoryName" placeholder="请输入" />
+                  <el-input size="mini"  clearable v-model="where.categoryName" placeholder="请输入" />
               </el-form-item>
           </el-col>
 
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
               <el-form-item label="类型:">
-                  <el-select v-model="where.feedStatus" clearable style="width: 100%">
+                  <el-select size="mini"  v-model="where.feedStatus" clearable style="width: 100%">
                     <el-option label="报工中" :value="1" />
                     <el-option label="投料中" :value="0" />
                   </el-select>
@@ -27,7 +27,7 @@
 
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
               <el-form-item label="设备名称:">
-                  <el-input clearable v-model="where.deviceName" placeholder="请输入" />
+                  <el-input size="mini"  clearable v-model="where.deviceName" placeholder="请输入" />
               </el-form-item>
           </el-col>
 
@@ -35,14 +35,14 @@
 
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
               <el-form-item label="工位:">
-                  <el-input clearable v-model="where.workstationName" placeholder="请输入" />
+                  <el-input size="mini"  clearable v-model="where.workstationName" placeholder="请输入" />
               </el-form-item>
           </el-col>
 
 
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
               <el-form-item label="工序:">
-                  <el-select v-model="where.taskId" filterable style="width: 100%">
+                  <el-select size="mini"  v-model="where.taskId" filterable clearable style="width: 100%">
                       <el-option v-for="(item,index) in produceTaskList" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
               </el-form-item>
@@ -61,10 +61,10 @@
 
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
               <el-form-item label-width="0px">
-                  <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+                  <el-button size="mini"  type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
                       查询
                   </el-button>
-                  <el-button @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
+                  <el-button size="mini"  @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
               </el-form-item>
           </el-col>
       </el-row>

src/views/InTheSystem/components/tgDetails.vue

@@ -21,9 +21,13 @@
         </template>
 
         <template v-slot:weight="{ row }">
-            <span v-if="row.extInfo.newWeight"> {{   row.extInfo.newWeight }} {{ row.extInfo.weightUnit }}</span>
-            <span v-else> {{ row.extInfo.weight }}{{ row.extInfo.weightUnit }} <el-tag size="mini" type="warning">原</el-tag></span>
-          
+          <span v-if="row.extInfo.newWeight">
+            {{ row.extInfo.newWeight }} {{ row.extInfo.weightUnit }}</span
+          >
+          <span v-else>
+            {{ row.extInfo.weight }}{{ row.extInfo.weightUnit }}
+            <el-tag size="mini" type="warning">原</el-tag></span
+          >
         </template>
       </ele-pro-table>
     </el-card>
@@ -57,24 +61,51 @@
             showOverflowTooltip: true,
             fixed: 'left'
           },
+          {
+            prop: 'batchNo',
+            label: '批次号',
+            align: 'center'
+          },
+
           {
             prop: 'workOrderCode',
             label: '工单编码',
             align: 'center',
             minWidth: 110
           },
+          {
+            prop: 'qualityTaskName',
+            label: '当前工序',
+            align: 'center'
+          },
 
           {
             prop: 'taskName',
-            label: '工序',
+            label: '处置工序',
             align: 'center'
           },
 
+    
+          {
+            prop: 'categoryCode',
+            label: '物品编码',
+            align: 'center',
+            minWidth: 160
+          },
+
+
           {
             prop: 'name',
             label: '物品名称',
             align: 'center',
-            minWidth: 280
+            minWidth: 
+          {
+            prop: 'categoryCode',
+            label: '物品编码',
+            align: 'center',
+            minWidth: 160
+          },
+
           },
 
           {
@@ -95,7 +126,6 @@
             align: 'center'
           },
 
-          
           {
             prop: 'quantity',
             label: '数量',

src/views/InTheSystem/index.vue

@@ -42,6 +42,12 @@
       // 表格列配置
       columns() {
         return [
+        {
+            prop: 'batchNo',
+            label: '批次号',
+            align: 'center',
+          },
+
           {
             columnKey: 'index',
             label: '序号',
@@ -58,17 +64,34 @@
             minWidth: 110
           },
 
+          {
+            prop: 'qualityTaskName',
+            label: '当前工序',
+            align: 'center'
+          },
+
+
           {
             prop: 'taskName',
-            label: '工序',
+            label: '处置工序',
             align: 'center'
           },
 
+
+          {
+            prop: 'categoryCode',
+            label: '物品编码',
+            align: 'center',
+            minWidth: 160
+          },
+
+
+
           {
             prop: 'name',
             label: '物品名称',
             align: 'center',
-            minWidth: 280
+            minWidth: 160
           },
 
           {

src/views/produce/components/jobBooking/details.vue

@@ -294,7 +294,6 @@
         };
         console.log(this.taskType);
         let URL = this.taskType == 5 ? listApplystorage : listWorkReport;
-        console.log(URL);
         URL(param).then((res) => {
           this.list = JSON.parse(JSON.stringify(res));
         });

src/views/produce/components/produceOrder.vue

@@ -246,8 +246,7 @@
         });
       },
       handleSelectionChange(val) {
-        console.log(val,222)
-        let initReportValue = val[0].singleReport;
+        let initReportValue = val[0] && val[0].singleReport;
         let allSame = true;
 
         val.forEach((item) => {