liqianyi 11 ماه پیش
والد
کامیت
4503af12ab
2فایلهای تغییر یافته به همراه14 افزوده شده و 9 حذف شده
  1. 1 1
      src/views/modules/production/scheduling.vue
  2. 13 8
      src/views/modules/warehouse/stock-order-inbound.vue

+ 1 - 1
src/views/modules/production/scheduling.vue

@@ -169,7 +169,7 @@
             <el-button v-if="isAuth('prod:production:purchase') && Number(scope.row.prodState) === 2" type="text" size="small" @click="purchaseHandle(scope.row)">转采购</el-button>
             <el-button v-if="isAuth('pur:commDetail:save') && Number(scope.row.prodState) === 2" type="text" size="small" @click="outsourceHandle(scope.row)">转委外</el-button>
 <!--            <el-button v-if="isAuth('prod:production:examine') && Number(scope.row.prodState) === 1" type="text" size="small" @click="preCheck(scope.row.id)">试制前检查</el-button>-->
-            <el-button v-if="isAuth('prod:production:plan') && Number(scope.row.prodState) === 2" type="text" size="small" @click="detail(scope.row.id, true)">排产</el-button>
+            <el-button v-if="isAuth('prod:production:plan') && Number(scope.row.prodState) === 2" type="text" size="small" @click="detail(scope.row.id, true)" v-reClick>排产</el-button>
 <!--            <el-button v-if="isAuth('pur:commDetail:save') && Number(scope.row.outsourcing) === 0" type="text" size="small" @click="outsourceHandle(scope.row.id)">委外生产</el-button>-->
             <el-button type="text" size="small" @click="printLabel(scope.row)">打印标签</el-button>
           </template>

+ 13 - 8
src/views/modules/warehouse/stock-order-inbound.vue

@@ -23,7 +23,7 @@
               </el-col>
             </el-row>
             <el-row class="my-row">
-              <el-col :span="8" style="padding-left: 20px">
+              <el-col :span="8" >
                 <el-form-item label="类别" prop="materialTypeId" :rules="{required: false, message: '类别不能为空', trigger: 'blur'}">
                   <!--                  <el-input v-if="!item.buttonType || item.buttonType === '0'" v-model="item.categoryName" :disabled="true" style="width: 200px"></el-input>-->
                   <material-type-component v-model="item.materialTypeId" :type-id.sync="item.materialTypeId"></material-type-component>
@@ -43,7 +43,7 @@
                   <el-button size="small" v-show="!item.buttonType || item.buttonType === '0'" @click="changeButtonType(item, 1)" type="danger">输入</el-button>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" style="padding-left: 20px">
+              <el-col :span="8" >
                 <el-form-item label="入库依据类别" prop="sourceCategory" :rules="{required: false, message: '类别不能为空', trigger: 'blur'}">
                   <el-select v-model="item.sourceCategory" placeholder="请选择" :disabled="true">
                     <el-option
@@ -57,7 +57,7 @@
               </el-col>
             </el-row>
             <el-row class="my-row">
-              <el-col :span="8" style="padding-left: 20px">
+              <el-col :span="8" >
                 <el-form-item label="炉(批)号" prop="batchNumber" :rules="{required: false, message: '炉(批)号不能为空', trigger: 'blur'}">
                   <el-input v-model="item.batchNumber" :disabled="display" placeholder="请填写炉(批)号"></el-input>
                 </el-form-item>
@@ -74,24 +74,29 @@
               </el-col>
             </el-row>
             <el-row class="my-row">
-              <el-col :span="8" style="padding-left: 20px">
+              <el-col :span="8" >
                 <el-form-item label="材料牌号" prop="materials" :rules="{required: false, message: '材料牌号不能为空', trigger: 'blur'}">
                   <el-input v-model="item.materials" :disabled="display" placeholder="材料牌号"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="单位" prop="unitName" :rules="{required: false, message: '单位不能为空', trigger: 'blur'}">
+                  <el-input v-model="item.unitName" :disabled="display" placeholder="单位"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row class="my-row">
               <el-col :span="8">
-                <el-form-item label="单价" prop="price">
+                <el-form-item label="单价" prop="price" >
                   <el-input-number v-model="item.price" :disabled="display" :precision="2" :min="0.00" :step="0.10"></el-input-number>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" style="padding-left: 20px">
+              <el-col :span="8" >
                 <el-form-item label="数量" prop="cnt">
                   <el-input-number v-model="item.cnt" :disabled="display" :min="0"></el-input-number>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" style="padding-left: 20px">
+              <el-col :span="8" >
                 <el-form-item label="金额" prop="amount">
                   <span>{{ Number(item.price * item.cnt) }}</span>
                 </el-form-item>
@@ -103,7 +108,7 @@
                   <el-input v-model="item.source" :disabled="display" placeholder="来源"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" style="padding-left: 20px">
+              <el-col :span="8" >
                 <el-form-item label="是否换算" prop="unitNeedChange">
                   <convert-component v-model="item.unitNeedChange" :convert-id="item.unitNeedChange"></convert-component>
                 </el-form-item>