修改bug

src/views/productionPlan/index.vue

@@ -9,7 +9,7 @@
         :activeName="activeName"
       >
       </productionPlan-search>
-      
+
       <!-- <div class="statistics">
         <el-row :gutter="24">
           <el-col :span="cardSpan">
@@ -89,7 +89,11 @@
         <el-button type="success" size="mini" @click="homogeneityInspect"
           >齐套性检查</el-button
         >
-        <el-button type="primary" size="mini" v-if="isshow" @click="disassemblePlan"
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="isshow"
+          @click="disassemblePlan"
           >计划分解</el-button
         >
         <el-button type="primary" size="mini">补单计划</el-button>
@@ -100,11 +104,14 @@
         >
         <el-button type="danger" size="mini">延期申请</el-button>
         <el-button type="danger" size="mini">变更申请</el-button>
-
-       
       </div>
 
-      <el-tabs v-model="activeName" type="card" size="mini" @tab-click="handleSele">
+      <el-tabs
+        v-model="activeName"
+        type="card"
+        size="mini"
+        @tab-click="handleSele"
+      >
         <el-tab-pane label="未发布" name="first"></el-tab-pane>
         <el-tab-pane label="已发布" name="second"></el-tab-pane>
         <el-tab-pane label="已变更" name="change"></el-tab-pane>
@@ -293,7 +300,6 @@
     <factoryAdd
       ref="factoryAddRef"
       :factoryType="factoryType"
-      
       @close="factoryClose"
     ></factoryAdd>
   </div>
@@ -347,7 +353,7 @@
           stockNum: 0
         },
         activeName: 'first',
-        isshow:true,
+        isshow: true,
         // 加载状态
         loading: false,
         pageType: 'add',
@@ -375,9 +381,7 @@
           { label: '外销计划', value: '2' },
           { label: '预制计划', value: '3' },
           { label: '改型计划', value: '4' },
-          { label: '返工返修计划', value: '5' },
-
-
+          { label: '返工返修计划', value: '5' }
         ],
         newColumns: [],
 
@@ -387,7 +391,7 @@
         factoryType: 3,
         factoryObj: {},
         cardSpan: 3,
-        columnsVersion:1
+        columnsVersion: 1
       };
     },
     computed: {
@@ -396,7 +400,7 @@
       },
       // 表格列配置
       columns() {
-        const num = this.columnsVersion
+        const num = this.columnsVersion;
         const opt = {
           first: [],
           second: [
@@ -731,7 +735,7 @@
             label: '客户简称',
             align: 'center',
             showOverflowTooltip: true
-          },
+          }
         ];
       }
     },
@@ -742,11 +746,11 @@
       this.getPlanStatistics();
     },
     methods: {
-      handleSele(e){
-        if(e.index==='1'){
-          this.isshow=false;
-        }else{
-          this.isshow=true;
+      handleSele(e) {
+        if (e.index === '1') {
+          this.isshow = false;
+        } else {
+          this.isshow = true;
         }
       },
 
@@ -846,13 +850,12 @@
       },
       // 修改计划
       planEdit(row) {
-
         if (row.timeDimensionPlanType == 3) {
-          console.log(row,'1111');
+          console.log(row, '1111');
           this.factoryObj = row;
           // this.factoryType = ;
           // this.factoryShow = true;
-          this.$refs.factoryAddRef.open(row );
+          this.$refs.factoryAddRef.open(row);
         } else {
           this.$router.push({
             path: '/saleOrder/salesToProduction',
@@ -892,7 +895,6 @@
 
           this.newColumns = [...this.columns, ...newRes, ...privateColumn];
 
-
           this.$forceUpdate();
         });
       },
@@ -903,15 +905,13 @@
 
       /* 刷新表格 */
       reload(where) {
-        
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
         });
       },
       newReload() {
-        
         this.$nextTick(() => {
-          this.$refs.table.reload({ page: 1});
+          this.$refs.table.reload({ page: 1 });
         });
       },
       /* 数据转为树形结构 */
@@ -1020,15 +1020,15 @@
 
       factAdd(type) {
         this.factoryType = type;
-  
+
         this.$refs.factoryAddRef.open();
         // this.factoryShow = true;
       },
 
       factoryClose(val) {
         // this.factoryShow = false;
-        this.factoryType= 3;
-        this.factoryObj= {};
+        this.factoryType = 3;
+        this.factoryObj = {};
         if (val) {
           this.reload();
         }

src/views/saleOrder/components/order-search.vue

@@ -7,91 +7,91 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="关键字:">-->
-<!--          <el-input-->
-<!--            v-model="where.keyWord"-->
-<!--            size="mini"-->
-<!--            placeholder="请输入"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="销售订单号:">-->
-<!--          <el-input-->
-<!--            v-model="where.code"-->
-<!--            size="mini"-->
-<!--            placeholder="请输入"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="产品编码:">-->
-<!--          <el-input-->
-<!--            v-model="where.productCode"-->
-<!--            size="mini"-->
-<!--            placeholder="请输入"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="行号:">-->
-<!--          <el-input-->
-<!--            v-model="where.lineNumber"-->
-<!--            size="mini"-->
-<!--            placeholder="请输入"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="牌号:">-->
-<!--          <el-input-->
-<!--            v-model="where.brandNo"-->
-<!--            size="mini"-->
-<!--            placeholder="请输入"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="型号:">-->
-<!--          <el-input-->
-<!--            v-model="where.model"-->
-<!--            size="mini"-->
-<!--            placeholder="请输入"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="订单来源:">-->
-<!--          <DictSelection-->
-<!--            dictName="订单来源"-->
-<!--            size="mini"-->
-<!--            clearable-->
-<!--            v-model="where.orderSource"-->
-<!--          >-->
-<!--          </DictSelection>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="客户名称:">-->
-<!--          <el-input-->
-<!--            v-model="where.customerName"-->
-<!--            size="mini"-->
-<!--            placeholder="请输入"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="订单类型:">-->
-<!--          <DictSelection-->
-<!--            dictName="订单类型"-->
-<!--            clearable-->
-<!--            size="mini"-->
-<!--            v-model="where.orderType"-->
-<!--          >-->
-<!--          </DictSelection>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="关键字:">-->
+      <!--          <el-input-->
+      <!--            v-model="where.keyWord"-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="销售订单号:">-->
+      <!--          <el-input-->
+      <!--            v-model="where.code"-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="产品编码:">-->
+      <!--          <el-input-->
+      <!--            v-model="where.productCode"-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="行号:">-->
+      <!--          <el-input-->
+      <!--            v-model="where.lineNumber"-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="牌号:">-->
+      <!--          <el-input-->
+      <!--            v-model="where.brandNo"-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="型号:">-->
+      <!--          <el-input-->
+      <!--            v-model="where.model"-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="订单来源:">-->
+      <!--          <DictSelection-->
+      <!--            dictName="订单来源"-->
+      <!--            size="mini"-->
+      <!--            clearable-->
+      <!--            v-model="where.orderSource"-->
+      <!--          >-->
+      <!--          </DictSelection>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="客户名称:">-->
+      <!--          <el-input-->
+      <!--            v-model="where.customerName"-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="订单类型:">-->
+      <!--          <DictSelection-->
+      <!--            dictName="订单类型"-->
+      <!--            clearable-->
+      <!--            size="mini"-->
+      <!--            v-model="where.orderType"-->
+      <!--          >-->
+      <!--          </DictSelection>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
         <el-form-item label="生产状态:">
           <el-select
@@ -137,25 +137,25 @@
           </el-select>
         </el-form-item>
       </el-col>
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="业务员:">-->
-<!--          <el-input-->
-<!--            v-model="where.salesman"-->
-<!--            size="mini"-->
-<!--            placeholder="请输入"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
-
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
-<!--        <el-form-item label="产品名称:">-->
-<!--          <el-input-->
-<!--            v-model="where.productName"-->
-<!--            size="mini"-->
-<!--            placeholder="请输入"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="业务员:">-->
+      <!--          <el-input-->
+      <!--            v-model="where.salesman"-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">-->
+      <!--        <el-form-item label="产品名称:">-->
+      <!--          <el-input-->
+      <!--            v-model="where.productName"-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="交货日期:">
@@ -173,16 +173,16 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">-->
-<!--        <el-form-item label="组织机构:">-->
-<!--          <auth-selection-->
-<!--            data-type="Array"-->
-<!--            size="mini"-->
-<!--            v-model="where.deptIds"-->
-<!--            style="width: 100%"-->
-<!--          ></auth-selection>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
+      <!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">-->
+      <!--        <el-form-item label="组织机构:">-->
+      <!--          <auth-selection-->
+      <!--            data-type="Array"-->
+      <!--            size="mini"-->
+      <!--            v-model="where.deptIds"-->
+      <!--            style="width: 100%"-->
+      <!--          ></auth-selection>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
       <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 3 }">
         <el-form-item label-width="0">
           <el-input
@@ -201,7 +201,6 @@
             </span>
             <el-dropdown-menu>
               <div class="searchExpend">
-
                 <el-row>
                   <el-form-item label="关键字:" label-width="80px">
                     <el-input
@@ -286,7 +285,7 @@
                   </el-form-item>
                 </el-row>
 
-                <el-row>
+                <!-- <el-row>
                   <el-form-item label="组织机构:">
                     <auth-selection
                       data-type="Array"
@@ -295,7 +294,7 @@
                       style="width: 100%"
                     ></auth-selection>
                   </el-form-item>
-                </el-row>
+                </el-row> -->
 
                 <el-row>
                   <el-form-item label="按单按库:">
@@ -315,7 +314,6 @@
                     </el-select>
                   </el-form-item>
                 </el-row>
-
               </div>
             </el-dropdown-menu>
           </el-dropdown>
@@ -348,11 +346,7 @@
             >
               交期预估</el-button
             > -->
-            <el-button
-              @click="homogeneityInspect"
-              size="mini"
-              type="success"
-            >
+            <el-button @click="homogeneityInspect" size="mini" type="success">
               齐套性检查</el-button
             >
             <el-button
@@ -389,9 +383,7 @@
             >
               <el-button type="warning" size="mini">批量导入</el-button>
             </el-upload>
-            <el-button type="info" size="mini">
-              下载模板
-            </el-button>
+            <el-button type="info" size="mini"> 下载模板 </el-button>
             <el-button
               type="danger"
               size="mini"
@@ -460,7 +452,6 @@
         productName: ''
       };
       return {
-      
         // 表单数据
         defaultWhere,
         where: { ...defaultWhere },
@@ -481,19 +472,25 @@
           { value: 1, label: '按单' },
           { value: 2, label: '按库' }
         ],
-         
-        orderList: [{
-          value: 0, label: '库存性订单'
-        },
-        {
-          value: 1, label: '生产性订单'
-        },
-        {
-          value: 2, label: '无客户生产性订单'
-        },
-        {
-          value: 4, label: '不定向订单'
-        },],
+
+        orderList: [
+          {
+            value: 0,
+            label: '库存性订单'
+          },
+          {
+            value: 1,
+            label: '生产性订单'
+          },
+          {
+            value: 2,
+            label: '无客户生产性订单'
+          },
+          {
+            value: 4,
+            label: '不定向订单'
+          }
+        ],
         loading: false
       };
     },
@@ -503,11 +500,9 @@
         return this.$store.state.theme.styleResponsive;
       },
 
-
       clientEnvironmentId() {
         return this.$store.state.user.info.clientEnvironmentId;
-      },
-
+      }
     },
     watch: {
       activeName: {
@@ -562,9 +557,9 @@
         const produceRoutingId = this.selection[0].produceRoutingId;
         const measuringUnit = this.selection[0].measuringUnit;
         const factoriesId = this.selection[0].factoriesId;
-        const bomCategoryId = this.selection[0].bomCategoryId
+        const bomCategoryId = this.selection[0].bomCategoryId;
         const saleType = this.selection[0].saleType;
-        const produceType=this.selection[0].produceType[0];
+        const produceType = this.selection[0].produceType[0];
 
         // if(!factoriesId){
         //   this.$message.warning('工厂未选择！');
@@ -603,7 +598,7 @@
             produceRoutingName: this.selection[0].produceRoutingName,
             factoriesId: factoriesId,
             bomCategoryId: bomCategoryId,
-            produceType:produceType
+            produceType: produceType
           }
         });
       },
@@ -681,15 +676,13 @@
       synchronous() {
         synchronousDataByJDY().then((res) => {
           this.$message.success('同步成功！');
-          this.reset()
+          this.reset();
         });
       },
-      payBudget(){
-
-      },
-      homogeneityInspect(){
+      payBudget() {},
+      homogeneityInspect() {
         this.$emit('check');
-      },
+      }
     }
   };
 </script>
@@ -716,7 +709,7 @@
   .button-link {
     color: #fff;
   }
-  .searchExpend{
+  .searchExpend {
     padding: 20px 50px 0 30px;
   }
 </style>

src/views/workOrder/index.vue

@@ -107,7 +107,7 @@
           >
             派单
           </el-link> -->
-          <!-- <el-link
+          <el-link
             type="primary"
             :underline="false"
             icon="el-icon-truck"
@@ -123,8 +123,8 @@
           >
             派单
           </el-link>
-          -->
-          <el-link
+
+          <!-- <el-link
             type="primary"
             :underline="false"
             icon="el-icon-truck"
@@ -139,7 +139,7 @@
             "
           >
             派单
-          </el-link>
+          </el-link> -->
         </template>
       </ele-pro-table>
     </el-card>