ysy пре 1 година
родитељ
комит
71684f1da5

+ 1 - 1
src/views/productionPlan/components/productionPlan-search.vue

@@ -158,7 +158,7 @@
         <el-form-item label="工单发布时间:" label-width="150px">
         <el-form-item label="工单发布时间:" label-width="150px">
           <el-date-picker
           <el-date-picker
             class="w100"
             class="w100"
-                size="mini"
+            size="mini"
             v-model="where.releaseTime"
             v-model="where.releaseTime"
             type="daterange"
             type="daterange"
             range-separator="至"
             range-separator="至"

+ 0 - 3
src/views/productionPlan/index.vue

@@ -111,7 +111,6 @@
           <el-link
           <el-link
             type="primary"
             type="primary"
             :underline="false"
             :underline="false"
-            icon="el-icon-truck"
             v-if="row.status == 2"
             v-if="row.status == 2"
             @click="handleOrderPublish(1, row)"
             @click="handleOrderPublish(1, row)"
           >
           >
@@ -121,7 +120,6 @@
             type="primary"
             type="primary"
             v-if="row.status == 3"
             v-if="row.status == 3"
             :underline="false"
             :underline="false"
-            icon="el-icon-truck"
             @click="handleOrderPublish(2, row)"
             @click="handleOrderPublish(2, row)"
           >
           >
             重新发布
             重新发布
@@ -130,7 +128,6 @@
             v-if="row.splitBatch != 2 && !row.joinPlanCode && activeName == 'first'"
             v-if="row.splitBatch != 2 && !row.joinPlanCode && activeName == 'first'"
             type="primary"
             type="primary"
             :underline="false"
             :underline="false"
-            icon="el-icon-edit"
             @click="planEdit(row)"
             @click="planEdit(row)"
           >
           >
             修改
             修改

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

@@ -13,7 +13,7 @@
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物料编码:">
+        <el-form-item label="产品编码:">
           <el-input v-model="where.productCode" size="mini"  placeholder="请输入"></el-input>
           <el-input v-model="where.productCode" size="mini"  placeholder="请输入"></el-input>
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>

+ 4 - 10
src/views/saleOrder/salesToProduction.vue

@@ -2,7 +2,7 @@
   <div class="ele-body">
   <div class="ele-body">
     <el-card shadow="never">
     <el-card shadow="never">
       <div class="body-title">
       <div class="body-title">
-        <div class="title-left">销售订单转生产计划</div>
+        <div class="title-left">{{type == 'edit' ? '计划修改' : '销售订单转生产计划'}}</div>
         <div class="title-right">
         <div class="title-right">
           <el-button @click="cancel">取消</el-button>
           <el-button @click="cancel">取消</el-button>
           <el-button type="primary" @click="toSubmit" :loading="loading">
           <el-button type="primary" @click="toSubmit" :loading="loading">
@@ -374,13 +374,7 @@
                   value-format="yyyy-MM-dd"
                   value-format="yyyy-MM-dd"
                 >
                 >
                 </el-date-picker>
                 </el-date-picker>
-                <!-- 	<el-date-picker
-						   style="width: 100%;"
-						   v-model="scope.row.reqMoldTime"
-						   type="datetime"
-						   placeholder="选择日期"
-						   value-format="yyyy-MM-dd HH:mm:ss">
-						 </el-date-picker> -->
+   
               </el-form-item>
               </el-form-item>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
@@ -433,13 +427,13 @@
 
 
           <el-table-column label="操作" align="center" width="70" fixed="right">
           <el-table-column label="操作" align="center" width="70" fixed="right">
             <template slot-scope="scope">
             <template slot-scope="scope">
-              <el-button type="text" @click="handleDeleteItem(scope.$index)"
+              <el-button type="text" @click="handleDeleteItem(scope.$index)" v-if="type != 'edit'"
                 >删除</el-button
                 >删除</el-button
               >
               >
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
-        <div class="add-product" @click="addEquipment">
+        <div class="add-product" @click="addEquipment" v-if="type != 'edit'">
           <i class="el-icon-circle-plus-outline"></i>
           <i class="el-icon-circle-plus-outline"></i>
         </div>
         </div>
         <el-row :gutter="24">
         <el-row :gutter="24">