修改bug

src/enum/dict.js

@@ -24,7 +24,7 @@ export default {
   外协委外: 'outsource_dict',
   工作流任务分配规则的类型: 'bpm_task_assign_rule_type',
   工作流任务分配自定义脚本: 'bpm_task_assign_script',
-  流程实例的结果: 'bpm_process_instance_result',
+  流程实例的结果: 'bpm_process_instance_result'
 };
 
 export const numberList = [
@@ -37,7 +37,7 @@ export const numberList = [
   'production_status',
   'plan_type',
   'delivery_status',
-   'margin_code'
+  'margin_code'
 ];
 //审核状态
 export const reviewStatus = {
@@ -45,4 +45,4 @@ export const reviewStatus = {
   1: '审核中',
   2: '已审核',
   3: '审核不通过'
-};
+};

src/styles/transition/common.scss

@@ -108,7 +108,7 @@
   border-radius: 3px  !important;
 }
 
-.el-input--medium .el-input__inner {
-  // height: 32px  !important;
-  line-height: 32px  !important;
-}
+// .el-input--medium .el-input__inner {
+//   // height: 32px  !important;
+//   line-height: 32px  !important;
+// }

src/views/cuttingPlan/components/plan-edit-dialog.vue

@@ -18,7 +18,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item label="需求类型:" prop="demandType">
+          <el-form-item label="需求类型" prop="demandType">
             <el-select
               v-model="formData.demandType"
               placeholder="请选择"
@@ -33,8 +33,9 @@
               >
               </el-option>
             </el-select>
-          </el-form-item> </el-col
-        ><el-col :span="8">
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label="计划名称" prop="name">
             <el-input
               placeholder="请选择"
@@ -329,7 +330,8 @@
           remark: '',
           detailRemoveIds: [],
           materialRemoveIds: [],
-          orderType: 1
+          orderType: 1,
+          demandType: ''
         },
         demandTypeList: [
           {

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

@@ -7,12 +7,12 @@
     @submit.native.prevent
   >
     <el-row :gutter="24">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="销售订单号:">
           <el-input v-model="where.code" placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="物料编码:">
           <el-input v-model="where.productCode" placeholder="请输入"></el-input>
         </el-form-item>
@@ -28,7 +28,7 @@
           </DictSelection>
         </el-form-item>
       </el-col> -->
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="采购类型:">
           <el-select
             v-model="where.purchaseType"
@@ -42,6 +42,15 @@
         </el-form-item>
       </el-col>
 
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+        <el-form-item label="订单类型:" label-width="80px">
+          <DictSelection
+            dictName="订单类型"
+            v-model="where.orderType"
+          ></DictSelection>
+        </el-form-item>
+      </el-col>
+
       <el-col v-bind="styleResponsive ? { sm: 4 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button
@@ -66,7 +75,8 @@
       const defaultWhere = {
         code: '',
         productCode: '',
-        purchaseType: '1'
+        purchaseType: '1',
+        orderType: ''
       };
       return {
         // 表单数据
@@ -83,12 +93,10 @@
     methods: {
       /* 搜索 */
       search() {
-        console.log('777777777');
         this.$emit('search', this.where);
       },
       /*  重置 */
       reset() {
-        console.log('888888888');
         this.where = { ...this.defaultWhere };
         this.search();
       }

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

@@ -13,7 +13,6 @@
         :rules="rules"
         label-width="90px"
         class="create-form"
-        :maxable="true"
       >
         <el-row :gutter="24">
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -206,6 +205,11 @@
             align="center"
             prop="contractNum"
           >
+            <template slot="header" slot-scope="scope">
+              <div class="header_required"
+                ><span class="is-required">订单数量</span></div
+              >
+            </template>
             <template slot-scope="scope">
               <el-form-item
                 label-width="0px"
@@ -861,6 +865,14 @@
             }
           }
 
+          if (!v.contractNum) {
+            flag = false;
+            this.$message.warning('请输入订单数量');
+            break;
+          }
+
+          //contractNum
+
           if (!v.produceRoutingId) {
             flag = false;
             this.$message.warning('请选择工艺路线');

src/views/saleOrder/salesToProductionNewTwo.vue

@@ -934,6 +934,9 @@
       },
       async getPlanInfo(id) {
         const data = await getUpdateInfoById(id);
+
+        console.log(data, '订单的data');
+
         this.form = data;
         // if (data.startTime) {
         //   this.form.startTime = new Date(data.startTime);
@@ -1047,6 +1050,10 @@
         this.form.produceRoutingName = '';
         this.form.produceVersionName = '';
 
+        if (this.bomVersionList.length == 0) {
+          this.form.bomCategoryId = '';
+        }
+
         this.bomVersionList.forEach((f) => {
           if (f.id == this.form.bomCategoryId) {
             this.$set(this.form, 'bomCategoryName', f.name);
@@ -1070,8 +1077,11 @@
       getSaleInfo() {
         let params = JSON.parse(this.$route.query.selection);
         productionToPlan(params).then((res) => {
+          console.log(res, 'resresres');
           this.form = deepClone(res);
           this.bomListVersion();
+
+          console.log(this.bomVersionList, 'this.bomVersionList');
           this.form.produceRoutingName =
             res.produceRoutingName || this.$route.query.produceRoutingName;
           this.form.produceRoutingId =

vue.config.js

@@ -36,10 +36,10 @@ module.exports = {
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.158:18086',
         // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.144:18086',
+        // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.251:18186',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域