Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/material/requisition/add.vue

@@ -337,6 +337,12 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
+                <el-form-item label="启用状态" prop="isEnable">
+                  <el-input v-show="false" disabled v-model="basicForm.isEnable"></el-input>
+                  <el-input disabled value="启用"></el-input>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="8">
                 <el-form-item label="业务线" prop="businessLine">
                   <el-select ref="lines" v-model="basicForm.businessLine" placeholder="请选择" clearable
                              :disabled="disable"
@@ -344,7 +350,7 @@
                     <el-option v-for="item in lineOptions" :key="item.id" :label="item.name" :value="item.id"/>
                   </el-select>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row :gutter="20">
               <el-col :span="8">
@@ -410,19 +416,29 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="业务部门" prop="businessDepartment">
-                  <el-select ref="departs" v-model="basicForm.businessDepartment" placeholder="请选择" clearable
-                             :disabled="disable || orgControl" @focus="chooseDepart">
-                    <el-option v-for="item in departOptions" :key="item.id" :label="item.label" :value="item.id"/>
+                <el-form-item label="内包装单位" prop="innerPackingUnit">
+                  <!-- <el-input :disabled="disable" v-model="basicForm.innerPackingUnit"></el-input> -->
+                  <el-select ref="innerPackingUnits" v-model="basicForm.innerPackingUnit" placeholder="请选择" clearable
+                             :disabled="disable" @focus="chooseInnerPackingUnit">
+                    <el-option v-for="item in innerPackingUnitOptions" :key="item.id" :label="item.name"
+                               :value="item.id"/>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="启用状态" prop="isEnable">
-                  <el-input v-show="false" disabled v-model="basicForm.isEnable"></el-input>
-                  <el-input disabled value="启用"></el-input>
+                <el-form-item label="内包装数" prop="innerPackingQty">
+                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.innerPackingQty"></el-input>
                 </el-form-item>
               </el-col>
+              <!-- <el-col :span="8">
+                <el-form-item label="业务部门" prop="businessDepartment">
+                  <el-select ref="departs" v-model="basicForm.businessDepartment" placeholder="请选择" clearable
+                             :disabled="disable || orgControl" @focus="chooseDepart">
+                    <el-option v-for="item in departOptions" :key="item.id" :label="item.label" :value="item.id"/>
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+              
             </el-row>
             <el-row :gutter="20">
               <el-col :span="8">
@@ -437,29 +453,15 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="内包装单位" prop="innerPackingUnit">
-                  <!-- <el-input :disabled="disable" v-model="basicForm.innerPackingUnit"></el-input> -->
-                  <el-select ref="innerPackingUnits" v-model="basicForm.innerPackingUnit" placeholder="请选择" clearable
-                             :disabled="disable" @focus="chooseInnerPackingUnit">
-                    <el-option v-for="item in innerPackingUnitOptions" :key="item.id" :label="item.name"
-                               :value="item.id"/>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="内包装数" prop="innerPackingQty">
-                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.innerPackingQty"></el-input>
-                </el-form-item>
-              </el-col>
+
               <el-col :span="8">
                 <el-form-item label="备注" prop="remark">
                   <el-input :disabled="disable" v-model="basicForm.remark"></el-input>
                 </el-form-item>
               </el-col>
+              
             </el-row>
+            
           </el-form>
         </div>
       </el-tab-pane>

src/views/purchase/purchase-order/column.js

@@ -1268,7 +1268,7 @@ export const SearchColumns = [
   { 
     item:{
       key: "erpOrderCode",
-      title: "NC订单号", 
+      title: "erp订单号", 
     },
     attr: {
       clearable:true,