修改bug

src/views/byProduct/components/byProduct-search.vue

@@ -1,40 +1,37 @@
 <!-- 搜索表单 -->
 <template>
-    <el-form
-      label-width="90px"
-      class="ele-form-search"
-      @keyup.enter.native="search"
-      @submit.native.prevent
-    >
-      <el-row :gutter="15">
-        <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-          <el-form-item label="回收单号:">
-            <el-input
-              size="mini"
-              clearable
-              v-model="where.code"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-  
-        <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-          <el-form-item label="工单号:">
-            <el-input
-              size="mini"
-              clearable
-              v-model="where.workOrderCode"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-
+  <el-form
+    label-width="90px"
+    class="ele-form-search"
+    @keyup.enter.native="search"
+    @submit.native.prevent
+  >
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
+        <el-form-item label="回收单号:">
+          <el-input
+            size="mini"
+            clearable
+            v-model="where.code"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
 
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
+        <el-form-item label="工单号:">
+          <el-input
+            size="mini"
+            clearable
+            v-model="where.workOrderCode"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
         <el-form-item label="工序名称:">
-  
-          <el-select size="mini"   v-model="where.taskId"  filterable>
+          <el-select size="mini" v-model="where.taskId" filterable>
             <el-option
               v-for="(item, index) in produceTaskList"
               :key="index"
@@ -45,111 +42,98 @@
         </el-form-item>
       </el-col>
 
-
-
       <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-          <el-form-item label="物品名称:">
-            <el-input
-              size="mini"
-              clearable
-              v-model="where.categoryName"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-
-
-        
-  
+        <el-form-item label="物品名称:">
+          <el-input
+            size="mini"
+            clearable
+            v-model="where.categoryName"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-col>
 
-        <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
-          <el-form-item label-width="0px">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-search"
-              class="ele-btn-icon"
-              @click="search"
-            >
-              查询
-            </el-button>
-            <el-button
-              size="mini"
-              @click="reset"
-              icon="el-icon-refresh-left"
-              type="primary"
-              >重置</el-button
-            >
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-  </template>
-  
-  <script>
-    import { produceTask } from '@/api/InTheSystem/index';
-    export default {
-      props: {
-  
-      },
-      data() {
-        // 默认表单数据
-        const defaultWhere = {
-          code: '',
-          workOrderCode: '',
-          taskId: '',
-          categoryName: ''
-        };
-        return {
-          // 表单数据
-          where: { ...defaultWhere },
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
+        <el-form-item label-width="0px">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-search"
+            class="ele-btn-icon"
+            @click="search"
+          >
+            查询
+          </el-button>
+          <el-button
+            size="mini"
+            @click="reset"
+            icon="el-icon-refresh-left"
+            type="primary"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
 
-          produceTaskList: []
-        };
-      },
-      computed: {
-        // 是否开启响应式布局
-        styleResponsive() {
-          return this.$store.state.theme.styleResponsive;
-        }
-      },
-      watch: {},
-      created() {
-        this.getTaskList();
-      },
-      methods: {
+<script>
+  import { produceTask } from '@/api/InTheSystem/index';
+  export default {
+    props: {},
+    data() {
+      // 默认表单数据
+      const defaultWhere = {
+        code: '',
+        workOrderCode: '',
+        taskId: '',
+        categoryName: ''
+      };
+      return {
+        // 表单数据
+        where: { ...defaultWhere },
 
-        getTaskList() {
+        produceTaskList: []
+      };
+    },
+    computed: {
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
+      }
+    },
+    watch: {},
+    created() {
+      this.getTaskList();
+    },
+    methods: {
+      getTaskList() {
         produceTask().then((res) => {
           this.produceTaskList = res.list;
-          this.where.taskId =  res.list[0].id
+          this.where.taskId = res.list[0].id;
 
-
-           if(this.where.taskId) {
+          if (this.where.taskId) {
             this.$emit('search', this.where);
-           }
-        
+          }
         });
       },
 
-
-        /* 搜索 */
-        search() {
-          this.$emit('search', this.where);
-        },
-        /*  重置 */
-        reset() {
-          this.where = { ...this.defaultWhere };
-          this.search();
-        }
+      /* 搜索 */
+      search() {
+        this.$emit('search', this.where);
+      },
+      /*  重置 */
+      reset() {
+        this.where = { ...this.defaultWhere };
+        this.search();
       }
-    };
-  </script>
-  <style lang="scss" scoped>
-    .ele-form-actions {
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
     }
-  </style>
-  
+  };
+</script>
+<style lang="scss" scoped>
+  .ele-form-actions {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+</style>

src/views/byProduct/index.vue

@@ -119,30 +119,35 @@
             prop: 'code',
             label: '回收单号',
             align: 'left',
-            width: '300'
+            width: '300',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'workOrderCode',
             label: '工单编码',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'taskName',
             label: '工序',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'categoryCode',
             label: '物品编码',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
             prop: 'categoryName',
             label: '物品名称',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
@@ -171,7 +176,8 @@
             prop: 'createTime',
             label: '创建时间',
             align: 'center',
-            width: 95
+            width: 95,
+            showOverflowTooltip: true
           },
 
           {

src/views/produce/components/footBtn.vue

@@ -82,22 +82,22 @@
             name: '异常',
             type: 'error',
             bjColor: '#cc0000'
-          }
+          },
           // {
           //   name: 'BOM',
           //   type: 'bom',
           //   bjColor: '#BB5500'
           // },
-          // {
-          //   name: '设备',
-          //   type: 'device',
-          //   bjColor: '#008866'
-          // },
-          // {
-          //   name: '周转车',
-          //   type: 'turnover',
-          //   bjColor: '#8C0044'
-          // }
+          {
+            name: '设备',
+            type: 'device',
+            bjColor: '#008866'
+          },
+          {
+            name: '周转车',
+            type: 'turnover',
+            bjColor: '#8C0044'
+          }
         ],
         btnList2: [
           // {

src/views/produce/components/inspection/components/oneJobQualityBomPL.vue

@@ -296,7 +296,7 @@
               </el-select>
             </div>
 
-            <div class="btn_start" v-if="row.extInfo.qualityParam.length > 0">
+            <div class="btn_start" v-if="row.extInfo.qualityParam && row.extInfo.qualityParam.length > 0">
               <div class="content_table2" style="margin-top: 6px">
                 <div class="head row rx-sc">
                   <div class="item ww15"> 质检类型</div>
@@ -459,7 +459,7 @@
             value: 1
           },
           {
-            name: '不合格', 
+            name: '不合格',
             value: 2
           },
           {
@@ -535,7 +535,7 @@
         this.$forceUpdate();
       },
 
-   
+
     },
 
     created() {

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

@@ -144,6 +144,8 @@
           </div>
         </div>
 
+        {{ clientEnvironmentId }} -{{}}
+
         <div
           class="btn-margin"
           v-if="
@@ -165,7 +167,8 @@
             !isDetails &&
             item.singleReport != 1 &&
             item.currentTaskDiagram.isFirstTask == 1 &&
-            item.product.length == 0
+            item.product.length == 0 &&
+            clientEnvironmentId != 3
           "
         >
           <div class="lable lable100 rx-cc"></div>
@@ -258,7 +261,11 @@
             let notFormedNum = 0;
 
             newVal.product.forEach((item) => {
-              if (!item.extInfo.isQualified || item.extInfo.isQualified == 1 || item.extInfo.isQualified == 3) {
+              if (
+                !item.extInfo.isQualified ||
+                item.extInfo.isQualified == 1 ||
+                item.extInfo.isQualified == 3
+              ) {
                 formedNum = formedNum + Number(item.feedQuantity);
               } else {
                 notFormedNum = notFormedNum + Number(item.feedQuantity);

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

@@ -34,7 +34,7 @@
         >
         <el-link
           type="text"
-          @click="handleView(item.warehouseName)"
+          @click="handleView(row.warehouseName)"
           v-if="isDetails"
           >查看</el-link
         >
@@ -118,6 +118,24 @@
         >
       </template>
     </el-dialog>
+
+    <el-dialog
+      title="仓库"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+      append-to-body
+      center
+    >
+      <span
+        >处置仓库：<span style="color: blue">{{ warehouseName }}</span></span
+      >
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -267,7 +285,9 @@
         visible: false,
         selection: [],
         cacheKeyUrl: 'produce-inspection-by-product-bom',
-        warehouseList: []
+        warehouseList: [],
+        dialogVisible: false,
+        warehouseName: ''
       };
     },
 
@@ -275,6 +295,7 @@
       handleClose() {
         this.penalizeIndex = null;
         this.visible = false;
+        this.dialogVisible = false;
       },
 
       penalize(index) {
@@ -301,7 +322,9 @@
       },
 
       handleView(name) {
-        this.$message.info(name || '未设置');
+        // this.$message.info(name || '未设置');
+        this.warehouseName = name ? name : '未设置';
+        this.dialogVisible = true;
       }
     }
   };

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

@@ -296,7 +296,7 @@
               </el-select>
             </div>
 
-            <div class="btn_start" v-if="row.extInfo.qualityParam.length > 0">
+            <div class="btn_start" v-if="row.extInfo.qualityParam && row.extInfo.qualityParam.length > 0">
               <div class="content_table2" style="margin-top: 6px">
                 <div class="head row rx-sc">
                   <div class="item ww15"> 质检类型</div>
@@ -459,7 +459,7 @@
             value: 1
           },
           {
-            name: '不合格', 
+            name: '不合格',
             value: 2
           },
           {
@@ -535,7 +535,7 @@
         this.$forceUpdate();
       },
 
-   
+
     },
 
     created() {

src/views/produce/components/turnover/components/detail.vue

@@ -0,0 +1,209 @@
+<template>
+  <el-dialog
+    title="周转车详情"
+    :visible.sync="addRepairNotesDialog"
+    v-if="addRepairNotesDialog"
+    :before-close="handleClose"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    class="turnover-detail-box"
+    append-to-body
+    width="70%"
+  >
+    <el-empty description="暂无详情" v-if="dataList.length == 0"></el-empty>
+    <div v-else class="detail-box">
+      <div v-for="item of dataList" :key="item.id">
+        <div v-if="item.status == 1" class="detail-sigle-box true">
+          <p>{{ item.code }}</p>
+          <span>闲置</span>
+        </div>
+        <div v-if="item.status == 2" class="detail-sigle-box false">
+          <p>{{ item.code }}</p>
+          <span>在用</span>
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    name: 'turnoverDetail',
+
+    data() {
+      return {
+        addRepairNotesDialog: false,
+        dataList: [
+          {
+            id: 1,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 2,
+            code: 13,
+            status: 2
+          },
+          {
+            id: 3,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 4,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 5,
+            code: 13,
+            status: 2
+          },
+          {
+            id: 6,
+            code: 13,
+            status: 2
+          },
+          {
+            id: 7,
+            code: 13,
+            status: 2
+          },
+          {
+            id: 8,
+            code: 13,
+            status: 2
+          },
+          {
+            id: 9,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 10,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 11,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 12,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 13,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 14,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 15,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 16,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 17,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 18,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 19,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 20,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 21,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 22,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 23,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 24,
+            code: 13,
+            status: 1
+          },
+          {
+            id: 25,
+            code: 13,
+            status: 1
+          }
+        ]
+      };
+    },
+
+    methods: {
+      handleClose() {
+        this.addRepairNotesDialog = false;
+      },
+
+      init() {
+        this.addRepairNotesDialog = true;
+      }
+    }
+  };
+</script>
+
+<style scoped lang="scss">
+  .turnover-detail-box {
+    .detail-box {
+      padding: 0 2rem;
+      box-sizing: border-box;
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      color: #333;
+      font-size: 1.2rem;
+      overflow: auto;
+
+      .detail-sigle-box {
+        display: flex;
+        height: 8rem;
+        width: 7rem;
+        margin: 1rem;
+        align-items: center;
+        flex-direction: column;
+        justify-content: space-evenly;
+
+        &.true {
+          background-color: #95f204;
+        }
+
+        &.false {
+          background-color: #02a7f0;
+        }
+      }
+    }
+  }
+</style>

src/views/produce/components/turnover/index.vue

@@ -68,14 +68,17 @@
         </div>
       </div>
     </el-drawer>
+
+    <detail ref="detailRef"></detail>
   </div>
 </template>
 
 <script>
+  import detail from './components/detail.vue';
   export default {
     name: 'device',
 
-    components: {},
+    components: { detail },
 
     data() {
       return {
@@ -114,7 +117,7 @@
         this.$forceUpdate();
       },
       repairBtn(row) {
-        this.$refs.addDialogRef.init(row);
+        this.$refs.detailRef.init();
       },
       reload() {}
     }

src/views/produceOrder/components/details/index.vue

@@ -42,7 +42,7 @@
             :title="item.taskTypeName"
             @click.native="handIdx(index, item)"
             :description="desIndex == index ? '此处' : ''"
-            :class="desIndex == index?'active':''"
+            :class="desIndex == index ? 'active' : ''"
           ></el-step>
         </el-steps>
 
@@ -58,13 +58,12 @@
             <jobDetails
               :routeObj="routeObj"
               :curTaskObj="curTaskObj"
-              :newId = "newId"
+              :newId="newId"
             ></jobDetails>
           </el-tab-pane>
 
           <!-- <el-tab-pane label="退料详情">
           </el-tab-pane> -->
-
         </el-tabs>
       </div>
     </el-drawer>
@@ -95,7 +94,7 @@
         activeIndex: 0,
         desIndex: 0,
         curTaskObj: null,
-        newId:'',
+        newId: '',
         routeObj: {
           id: null
         }
@@ -129,10 +128,9 @@
             (item) => Number(item.taskId) == Number(this.workOrderInfo.taskId)
           );
 
-
           this.desIndex = index;
-          console.log(this.routeList,'888888');
-          this.newId = this.routeList[this.desIndex].taskId||'';
+          console.log(this.routeList, '888888');
+          this.newId = this.routeList[this.desIndex].taskId || '';
 
           if (this.workOrderInfo.taskId != -2) {
             this.curTaskObj = JSON.parse(JSON.stringify(this.routeObj));
@@ -151,7 +149,7 @@
           this.$message.info('完结状态不能点击');
         } else {
           this.desIndex = index;
-          this.newId = this.routeList[this.desIndex].taskId||'';
+          this.newId = this.routeList[this.desIndex].taskId || '';
         }
       }
     }
@@ -190,8 +188,8 @@
     box-sizing: border-box;
   }
   ::v-deep .active .is-text {
-    background: #FFA929; /* 背景色 */
-    border-color: #FFA929;
+    background: #ffa929; /* 背景色 */
+    border-color: #ffa929;
     color: #ffffff; /* 图标文字颜色 */
   }
 </style>

src/views/produceWord/index.vue

@@ -138,7 +138,8 @@ r++<template>
             prop: 'batchNo',
             label: '批次号',
             align: 'center',
-            minWidth: 100
+            minWidth: 100,
+            showOverflowTooltip: true
           },
 
           {
@@ -146,37 +147,44 @@ r++<template>
             slot: 'code',
             label: '生产订单号',
             align: 'center',
-            minWidth: 110
+            minWidth: 110,
+            showOverflowTooltip: true
           },
           {
             prop: 'productionPlanCode',
             label: '计划编码',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'produceRoutingName',
             label: '工艺路线',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'productCode',
             label: '编码',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'productName',
             label: '名称',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'brandNo',
             label: '牌号',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'model',
             label: '型号',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true
           },
 
           {
@@ -185,7 +193,8 @@ r++<template>
             align: 'center',
             minWidth: 120,
             slot: 'priority',
-            sortable: 'custom'
+            sortable: 'custom',
+            showOverflowTooltip: true
           },
 
           {

src/views/sample/index.vue

@@ -239,9 +239,13 @@
           {
             label: '状态:',
             value: 'status',
-            slot: 'status',
             type: 'select',
-            placeholder: ''
+            placeholder: '',
+            planList: [
+              { value: 0, label: '待处置' },
+              { value: 1, label: '部分处置' },
+              { value: 2, label: '处置完成' }
+            ]
           }
         ];
       }

vue.config.js

@@ -35,13 +35,13 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.33:18086',
-        // target: 'http://192.168.1.251:18186',
+        target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {