Merge branch 'dev_pu_ownership' into dev

src/views/purchase/ownershipClose/index.vue

@@ -97,7 +97,12 @@
         </el-form-item>
         <el-form-item label="天数" prop="day">
           <el-col :span="8">
-            <el-input type="number" oninput="value=value.replace(/[^0-9.]/g,'')" v-only-number="{max:99999,min:0,precision:0}" v-model="form.day"></el-input>
+            <el-input type="number" 
+              oninput="if(value > 100000) value = 99999; if(value < 0 || value == '' || value == null) value = 0;"
+              :maxlength="6"
+              :minlength="1" 
+              v-model="form.day">
+            </el-input>
           </el-col>
         </el-form-item>
       </el-form>

src/views/purchase/ownershipCp/index.vue

@@ -80,6 +80,11 @@
             <el-input v-model="form.code"></el-input>
           </el-col>
         </el-form-item>
+        <el-form-item label="物料" prop="material" v-show="false">
+          <el-col :span="8">
+            <el-input v-model="form.material"></el-input>
+          </el-col>
+        </el-form-item>
         <el-form-item label="物料" prop="materialName">
           <DrPopoverSelectV2
             size="mini"
@@ -94,6 +99,11 @@
           >
           </DrPopoverSelectV2>
         </el-form-item>
+        <el-form-item label="客户" prop="customer" v-show="false">
+          <el-col :span="8">
+            <el-input v-model="form.customer"></el-input>
+          </el-col>
+        </el-form-item>
         <el-form-item label="客户" prop="customerName">
           <DrPopoverSelectV2
             size="mini"
@@ -163,10 +173,10 @@ export default {
         code: [
           { required: true, message: "编码不能为空", trigger: "blur" },
         ],
-        materialName: [
+        material: [
           { required: true, message: "物料不能为空", trigger: "blur" },
         ],
-        customerName: [
+        customer: [
           { required: true, message: "客户不能为空", trigger: "blur" },
         ],
       },

src/views/purchase/transferOrder/add.vue

@@ -85,6 +85,7 @@
                   customerName: 'name',
                 }"
                 :source.sync="basicForm"
+                :disabled="sonDisable"
               >
               </DrPopoverSelectV2>
 
@@ -613,13 +614,13 @@
                   <template slot-scope="scope">
                     <el-form-item class="hang">
                       <el-input
-                        disabled
+                        :disabled="sonDisable || isDCCk"
                         size="mini"
                         v-model="scope.row.producBatch"
                       >
                         <el-button
                           size="mini"
-                          :disabled="sonDisable"
+                          :disabled="sonDisable || isDCCk"
                           slot="append"
                           icon="el-icon-more"
                           @click="chooseBatch(scope.$index,'批号')"
@@ -1221,7 +1222,7 @@
               </el-table>
             </el-tab-pane>
           </el-tabs>
-          <el-button type="primary" style='position: absolute;right:10px;top:5px;' size="mini" v-if="sonPageStu == 'check' || sonPageStu == 'edit'" @click="showReserved">货权预留单</el-button>
+          <el-button type="primary" style='position: absolute;right:70px;top:5px;' size="mini" v-if="sonPageStu == 'check' || sonPageStu == 'edit'" @click="showReserved">货权预留单</el-button>
           <el-button type="primary" style='position: absolute;right:10px;top:5px;' size="mini" v-if="!sonDisable" @click="addLine">增行</el-button>
         </div>
         <el-divider content-position="left">表尾信息</el-divider>