还原

mes/mes-ui/src/views/mes/pro/proroute/product.vue

@@ -150,30 +150,6 @@
               </el-form-item>
             </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="配方" prop="formulaId">
-              <el-select v-model="selectFormulaId" placeholder="请选择配方" size="large"
-                @change="selectformulaChange" filterable>
-                <el-option v-for="item in formulaList" :key="item.formulaId" :label="item.formulaName"
-                  :value="item.formulaId" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="2">
-            <el-button type="warning" @click="handleDeleteFormula">删除</el-button>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="配方产品">
-              <el-input readonly v-model="selectFormula.itemName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="配方备注">
-              <el-input readonly type="textarea" v-model="selectFormula.remark"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="12">
               <el-form-item label="规格型号" prop="specification">

mes/mes-ui/src/views/mes/wm/itemrecpt/line.vue

@@ -60,31 +60,6 @@
           <el-input-number v-model="scope.row.quantityRecived" :min="0" placeholder="请输入数量" :disabled="optType == 'view'"/>
         </template>
       </el-table-column>
-      <el-table-column label="价格" align="center" prop="price" width="210" :formatter="formatPrice">
-        <template slot-scope="scope">
-          <template v-if="!purchaseId">
-            <el-input-number v-model="scope.row.price" :step="0.01" :min="0" placeholder="请输入价格" :disabled="optType == 'view'"/>
-          </template>
-          <template v-else>
-            <el-input v-model="scope.row.price" readonly placeholder="请输入价格" :disabled="optType == 'view'"/>
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column label="税率" align="center" prop="cess" width="210" :formatter="formatPrice">
-        <template slot-scope="scope">
-          <template v-if="!purchaseId">
-            <el-input-number v-model="scope.row.cess" :step="0.01" :min="0" placeholder="请输入税率" :disabled="optType == 'view'"/>
-          </template>
-          <template v-else>
-            <el-input v-model="scope.row.cess" readonly placeholder="请输入税率" :disabled="optType == 'view'"/>
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column label="金额" align="center" prop="price" :formatter="formatPrice">
-         <template slot-scope="scope">
-          {{ caclAmount(scope.row)}}
-         </template>
-      </el-table-column>
       <el-table-column label="仓库" align="center" prop="warehouseName" width="210px" >
         <template #default="{row, $index}">
           <el-cascader v-model="row.warehouseInfo"