Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/BidSystem/DeepeningOrder/info.vue

@@ -8,7 +8,7 @@
           style="margin-right: 10px"
           >完成</Button
         > -->
-        <Upload
+        <!-- <Upload
           style="display: inline"
           name="your_file"
           :show-upload-list="false"
@@ -17,8 +17,8 @@
           :on-success="uploadSuccess"
           :action="$store.state.ip + '/api/order_area_product_import'"
         >
-          <Button type="primary" style="margin-right: 10px">导入</Button>
-        </Upload>
+          <Button type="primary" style="margin-right: 10px">导入1</Button>
+        </Upload> -->
         <Button
           @click="showSupModal = true"
           type="primary"

src/views/BidSystem/ProductDeOrder/detail.vue

@@ -129,7 +129,7 @@
         <Table :columns="tableColumns" :data="formData.detail" border @on-selection-change='changeSelection'>
           <template slot="set" slot-scope="{ row, index }">
             <a
-              :disabled="row.status != 0"
+              :disabled="row.explode_status != 0"
               style="margin:0 5px"
               @click="handleSet(row, index, 1)"
               >拆单</a

src/views/BidSystem/ProductDeOrder/list.vue

@@ -60,7 +60,7 @@
         <div>
           <a
             style="margin: 0 5px"
-            :disabled="row.sub_status != 2"
+            :disabled="row.is_click == 0"
             @click="handleSet(row, index, 1)"
             >下生产</a
           >

src/views/MeasurementOrderMannage/edit.vue

@@ -291,6 +291,7 @@ export default {
         query: {
           type: this.$route.query.type,
           order_no: this.$route.query.order_no,
+          oa_id:this.$route.query.oa_id
         },
       });
     },

src/views/ProductionOrderList/ProductionsOrder/list.vue

@@ -51,7 +51,7 @@
              @click="goDetial(row)">详情</a>
           <a v-if='persimissionData["下生产计划"]||persimissionData.all'
              style="margin:0 5px"
-             :disabled="row.is_plan==1"
+             :disabled="row.is_plan==2"
              @click="openModal(row)">下生产计划</a>
         </div>
       </template>
@@ -194,7 +194,6 @@ export default {
         {
           title: '生产状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
           option: [
-            { label: '全部', value: 99 },
             { label: '未下计划', value: 0 },
             { label: '计划中', value: 1 },
             { label: '计划完成', value: 2 },