xzt-666,324,326

src/views/material/requisition/add.vue

@@ -257,12 +257,12 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="最小起定量" prop="minOrderQty">
-                  <el-input :disabled="disable" v-model="basicForm.minOrderQty"></el-input>
+                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.minOrderQty"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="最小包装量" prop="minPackQty">
-                  <el-input :disabled="disable" v-model="basicForm.minPackQty"></el-input>
+                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.minPackQty"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -277,36 +277,36 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="最小批量" prop="minBatchQty">
-                  <el-input :disabled="disable" v-model="basicForm.minBatchQty"></el-input>
+                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.minBatchQty"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="长度(MM)" prop="length">
-                  <el-input :disabled="disable" v-model="basicForm.length"></el-input>
+                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.length"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="高度(MM)" prop="height">
-                  <el-input :disabled="disable" v-model="basicForm.height"></el-input>
+                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.height"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="宽度(MM)" prop="width">
-                  <el-input :disabled="disable" v-model="basicForm.width"></el-input>
+                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.width"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="箱包装数" prop="boxPackaingQty">
-                  <el-input :disabled="disable" v-model="basicForm.boxPackaingQty"></el-input>
+                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.boxPackaingQty"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="中包装数" prop="mediumPackageQty">
-                  <el-input type="number" min="0" :disabled="disable" v-model="basicForm.mediumPackageQty"></el-input>
+                  <el-input  type="number" min="0" :disabled="disable" v-model="basicForm.mediumPackageQty"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">

src/views/purchase/MaterialClassDivision/add.vue

@@ -202,12 +202,14 @@
 
           <el-col :span="1.5">
             <el-form-item label="同步状态">
-              <el-input
-                v-model="basicForm.sendStatus"
-                size="mini"
-                disabled
-                style="width: 200px"
-              />
+              <el-select disabled v-model="basicForm.sendStatus" size="mini" style="width: 200px">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
          </el-col>
 
@@ -303,13 +305,13 @@ export default {
         buyerName: '',
         puDept: '',
         puDeptName: '',
-        sendStatus: '',
+        sendStatus: 'N',
         remark: ''
       },
       options: [{
-        value: 'Y', label: '是',
+        value: 'Y', label: '已同步',
       }, {
-        value: 'N', label: '否'
+        value: 'N', label: '未同步'
       }],
       referCondition: {
         type: '',
@@ -416,11 +418,15 @@ export default {
         this.staffOptions = selection
         this.basicForm.orderPersonal = selection[0].code
         this.basicForm.orderPersonalName = selection[0].name
+        this.basicForm.orderDept = selection[0].deptId
+        this.basicForm.orderDeptName = selection[0].deptName
       }
       if (this.referCondition.title == '采购员') {
         this.staff2Options = selection
         this.basicForm.buyer = selection[0].code
         this.basicForm.buyerName = selection[0].name
+        this.basicForm.puDept = selection[0].deptId
+        this.basicForm.puDeptName = selection[0].deptName
       }
     },
     // 回显参照框 加title解决判断重复提交问题

src/views/purchase/MaterialClassDivision/index.vue

@@ -96,7 +96,7 @@
         <el-row :gutter="10">
           <el-col :span="1.5">
             <el-form-item label="物料编码">
-              <el-input style="width: 200px" size="mini" readonly v-model="queryParams.material">
+              <el-input style="width: 200px" size="mini" readonly v-model="queryParams.materialCode">
                   <el-button slot="append" icon="el-icon-more" @click="test01"></el-button>
               </el-input>
             </el-form-item>
@@ -214,9 +214,9 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column show-overflow-tooltip type="selection" width="55" />
-          <el-table-column show-overflow-tooltip label="物料分类编码" align="center" prop="materialClassify"/>
+          <el-table-column show-overflow-tooltip label="物料分类编码" align="center" width="150" prop="materialClassify"/>
           <el-table-column show-overflow-tooltip label="物料分类名称" align="center" width="200" prop="materialClassifyName" />
-          <el-table-column show-overflow-tooltip label="一级分类名称" align="center" prop="materialClassifyOneName" />
+          <el-table-column show-overflow-tooltip label="一级分类名称" align="center" width="150" prop="materialClassifyOneName" />
           <el-table-column show-overflow-tooltip label="二级分类名称" align="center" width="150" prop="materialClassifyTwoName" />
           <el-table-column show-overflow-tooltip label="三级分类名称" align="center" width="150" prop="materialClassifyThreeName"/>
           <el-table-column show-overflow-tooltip label="四级分类名称" align="center" width="150" prop="materialClassifyFourName" />
@@ -228,10 +228,10 @@
           <el-table-column show-overflow-tooltip label="采购员" align="center" width="150" prop="buyerName" />
           <el-table-column show-overflow-tooltip label="订单部门" align="center" width="150" prop="orderDeptName" />
           <el-table-column show-overflow-tooltip label="部门" align="center" width="150" prop="puDeptName" />
-          <el-table-column show-overflow-tooltip label="创建人" align="center" width="150" prop="createdByName" />
-          <el-table-column show-overflow-tooltip label="创建时间" align="center" width="150" prop="createdTime" />
-          <el-table-column show-overflow-tooltip label="修改人" align="center" width="150" prop="updatedByName" />
-          <el-table-column show-overflow-tooltip label="修改时间" align="center" width="150" prop="updatedTime" />
+          <el-table-column show-overflow-tooltip label="创建人" align="center" width="150" prop="createByName" />
+          <el-table-column show-overflow-tooltip label="创建时间" align="center" width="150" prop="createTime" />
+          <el-table-column show-overflow-tooltip label="修改人" align="center" width="150" prop="updateByName" />
+          <el-table-column show-overflow-tooltip label="修改时间" align="center" width="150" prop="updateTime" />
           <el-table-column
           fixed="right"
           label="操作"
@@ -311,7 +311,7 @@ export default {
         materialClassifyThreeName: '',
         materialClassifyFour: '',
         materialClassifyFourName: '',
-        material: '',
+        materialCode: '',
         materialName: '',
         orderPersonal: '',
         buyer: '',
@@ -363,7 +363,7 @@ export default {
         materialClassifyThreeName: '',
         materialClassifyFour: '',
         materialClassifyFourName: '',
-        material: '',
+        materialCode: '',
         materialName: '',
         orderPersonal: '',
         buyer: '',
@@ -433,7 +433,7 @@ export default {
       this.$refs.contractSelect.init()
     },
     selectionsToInput(selections) {
-      this.queryParams.material = selections[0].code
+      this.queryParams.materialCode = selections[0].code
     },
     // 选择默认采购组织
     chooseRefer(type, isPage, title) {

src/views/purchase/PurchaseDemandList/add.vue

@@ -226,7 +226,7 @@
           <el-table-column show-overflow-tooltip label="采购周期" align="center"  prop="puPeriod" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
-                <el-input clearable :readonly="sonDisable" size="mini" v-model="scope.row.puPeriod"/>
+                <el-input type="number" min="0" clearable :readonly="sonDisable" size="mini" v-model="scope.row.puPeriod"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -256,14 +256,14 @@
             <el-table-column show-overflow-tooltip label="预留周期" align="center" prop="reservedPeriod" width="150px">
               <template slot-scope="scope">
                 <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'reservedPeriod'" :rules="{ required: isYl, message: '请填写预留周期', trigger: 'blur' }">
-                  <el-input clearable :readonly="sonDisable" size="mini" v-model="scope.row.reservedPeriod"/>
+                  <el-input type="number" min="0" clearable :readonly="sonDisable" size="mini" v-model="scope.row.reservedPeriod"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
             <el-table-column show-overflow-tooltip label="预留数量" align="center"  prop="reservedQty" width="150px">
               <template slot-scope="scope">
                 <el-form-item class="hang">
-                  <el-input readonly size="mini" v-model="scope.row.reservedQty"/>
+                  <el-input type="number" min="0" readonly size="mini" v-model="scope.row.reservedQty"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -271,7 +271,7 @@
           <el-table-column show-overflow-tooltip label="实际(业务)需求量" align="center"  prop="qty" width="120px">
             <template slot-scope="scope">
               <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'qty'" :rules="{ required: true, message: '请填写实际(业务)需求量', trigger: 'blur' }">
-                <el-input clearable :readonly="sonDisable" size="mini" v-model="scope.row.qty" @input="getYLSL(scope)"/>
+                <el-input type="number" min="0" clearable :readonly="sonDisable" size="mini" v-model="scope.row.qty" @input="getYLSL(scope)"/>
               </el-form-item>
             </template>
           </el-table-column>
@@ -336,7 +336,7 @@
           <el-table-column show-overflow-tooltip label="最终净需求量" align="center"  prop="resDemandQty" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
-                <el-input clearable :readonly="sonDisable" size="mini" v-model="scope.row.resDemandQty"/>
+                <el-input type="number" min="0" clearable :readonly="sonDisable" size="mini" v-model="scope.row.resDemandQty"/>
               </el-form-item>
             </template>
           </el-table-column>

src/views/purchase/transferOrder/add.vue

@@ -128,6 +128,7 @@
             <el-form-item label="总数量">
               <el-input
                 v-model="basicForm.qty"
+                type="number" min="0"
                 size="mini"
                 :disabled="sonDisable"
                 clearable
@@ -273,7 +274,7 @@
           <el-table-column show-overflow-tooltip label="数量" align="center" prop="qty" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
-                <el-input :readonly="sonDisable" clearable size="mini" v-model="scope.row.qty" @input="getSL(scope)"/>
+                <el-input type="number" min="0" :readonly="sonDisable" clearable size="mini" v-model="scope.row.qty" @input="getSL(scope)"/>
               </el-form-item>
             </template>
           </el-table-column>
@@ -282,7 +283,7 @@
           <el-table-column show-overflow-tooltip label="主数量" align="center" prop="mainQty" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
-                <el-input :readonly="sonDisable" clearable size="mini" v-model="scope.row.mainQty" @input="getZSL(scope)"/>
+                <el-input type="number" min="0" :readonly="sonDisable" clearable size="mini" v-model="scope.row.mainQty" @input="getZSL(scope)"/>
               </el-form-item>
             </template>
           </el-table-column>