Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!162

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/catalogue/column.js

@@ -32,10 +32,11 @@ export const FormColumns = [
     disabled: true,
     readonly: true,
   },
+  { key: "materialName", title: "物料名称" },
   { key: "material", title: "物料编码" },
   { key: "materialClassify", title: "物料一级分类" },
+  { key: "manufacturerName", title: "生产厂家名称" },
   { key: "manufacturer", title: "生产厂家" },
-  { key: "materialName", title: "物料名称" },
   { key: "model", title: "物料型号" },
   { key: "specification", title: "物料规格" },
   { key: "supplier", title: "供应商" },
@@ -86,7 +87,7 @@ export const SearchColumns = [
     inputType: "PopoverSelect",
     referName: "ORG_PARAM",
     dataMapping: {
-      puOrg: "code",
+      puOrg: "id",
       puOrgName: "name",
     },
   },
@@ -101,7 +102,7 @@ export const SearchColumns = [
     inputType: "PopoverSelect",
     referName: "SUPPLIER_PARAM",
     dataMapping: {
-      supplier: "code",
+      supplier: "id",
       supplierName: "name",
     },
   },
@@ -112,7 +113,7 @@ export const SearchColumns = [
     inputType: "PopoverSelect",
     width: 200,
     referName: "MATERIAL_PARAM",
-    valueKey: "code",
+    valueKey: "id",
   },
   {
     key: "status",

src/views/purchase/contract/add/column.js

@@ -76,7 +76,7 @@ export const FormColumns = [
   {
     key: "grossRateAverage",
     title: "平均毛利率",
-    inputType: "Input",
+    inputType: "InputNumber",
     require: true,
   },
   {
@@ -103,7 +103,7 @@ export const FormColumns = [
   {
     key: "brandGrossRate",
     title: "同类品牌及毛利率",
-    inputType: "Input",
+    inputType: "InputNumber",
     require: true,
   },
   {

src/views/purchase/contract/edit/index.vue

@@ -163,7 +163,10 @@ export default {
       await this.root
         .useAlteration(prop)
         .then(() => {
+          const [{ id }] = prop;
+          const { fetchItem } = this.root.$refs.SeeModel;
           this.hide();
+          fetchItem(id);
         })
         .catch(() => {});
     },

src/views/purchase/contract/index.vue

@@ -101,7 +101,6 @@ export default {
       await open(id);
     },
     hasPowerEdit(prop) {
-      return true;
       if (prop.length === 1) {
         const [{ status }] = prop;
         if (status !== "2") return true;

src/views/purchase/contract/see/index.vue

@@ -98,6 +98,19 @@ export default {
           ></el-button>
         </el-tooltip>
         <el-tooltip
+          v-if="root.hasPowerAlteration([params])"
+          effect="dark"
+          content="变 更"
+          placement="bottom-end"
+        >
+          <el-button
+            :size="size"
+            circle
+            icon="el-icon-edit"
+            @click="root.useEdit([params])"
+          ></el-button>
+        </el-tooltip>
+        <el-tooltip
           v-if="root.hasPowerEdit([params])"
           effect="dark"
           content="编 辑"

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

@@ -143,9 +143,30 @@ export const Columns = [
     isShow:true,
     disabled:true,
   },
-  { key: "money", title: "价税合计", inputType: "Input", isShow:true, disabled:true,},
-  { key: "originalMoney", title: "原始总金额", inputType: "Input",  isShow:true, disabled:true,},
-  { key: "notaxMoney", title: "无税金额", inputType: "Input",  isShow:true, disabled:true,},
+  { 
+    key: "money", 
+    title: "价税合计", 
+    inputType: "InputNumber",
+    controlsPosition: "right", 
+    isShow:true, 
+    disabled:true,
+  },
+  { 
+    key: "originalMoney", 
+    title: "原始总金额", 
+    inputType: "InputNumber",
+    controlsPosition: "right", 
+    isShow:true, 
+    disabled:true,
+  },
+  { 
+    key: "notaxMoney", 
+    title: "无税金额", 
+    inputType: "InputNumber",  
+    controlsPosition: "right",
+    isShow:true, 
+    disabled:true,
+  },
   {
     key: "status",
     title: "单据状态",
@@ -202,13 +223,15 @@ export const Columns = [
   { 
     key: "rebateMoney", 
     title: "订单使用返利金额", 
-    inputType: "Input",
+    inputType: "InputNumber",
+    controlsPosition: "right",
     isShow:true, 
   },
   { 
     key: "deductionMoney", 
     title: "订单抵扣余款金额", 
-    inputType: "Input",
+    inputType: "InputNumber",
+    controlsPosition: "right",
     isShow:true, 
   },
   { 
@@ -330,12 +353,25 @@ export const Columns = [
   { 
     key: "applyPaymentMoney", 
     title: "累计付款申请金额", 
-    inputType: "Input", 
+    inputType: "InputNumber", 
+    controlsPosition: "right",
     isShow:true,
     disabled:true,
   },
-  { key: "paymentMoney", title: "累计付款金额", inputType: "Input", isShow:true,},
-  { key: "invoiceMoney", title: "发票金额", inputType: "Input",isShow:true, },
+  { 
+    key: "paymentMoney", 
+    title: "累计付款金额", 
+    inputType: "InputNumber", 
+    controlsPosition: "right",
+    isShow:true,
+  },
+  { 
+    key: "invoiceMoney", 
+    title: "发票金额", 
+    inputType: "InputNumber",
+    controlsPosition: "right",
+    isShow:true,
+   },
   {
     key: "supplierPersonalName",
     title: "供应商业务员",
@@ -597,28 +633,68 @@ export const TabColumns = [
       { 
         key: "taxPrice", 
         title: "含税单价", 
-        inputType: "Input",
+        inputType: "InputNumber",
+        controlsPosition: "right",
         require: true,
         disabled:true,
-        width: 120,
+        width: 180,
+       },
+      { 
+        key: "money", 
+        title: "价税合计", 
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        disabled:true,
+        width: 180,
        },
-      { key: "money", title: "价税合计", inputType: "Input",disabled:true, },
       { //materialRate  materialRateName
         key: "tax", 
         title: "税率",
-        inputType: "Input",
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        disabled:true,
+        width: 180,
+      },
+      { 
+        key: "taxDeductMoneya", 
+        title: "折扣金额", 
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        disabled:true,
+        width: 180,
+       },
+      { 
+        key: "arrivalQty",
+        title: "已到货数量",
+        inputType: "InputNumber",
+        controlsPosition: "right",
         disabled:true,
+        width: 180,
+      },
+      { 
+        key: "unarrivedQty", 
+        title: "未到货数量", 
+        inputType: "InputNumber", 
+        controlsPosition: "right",
+        disabled:true,
+        width: 180,
       },
-      { key: "taxDeductMoneya", title: "折扣金额", inputType: "Input",disabled:true, },
-      { key: "arrivalQty", title: "已到货数量", inputType: "Input", disabled:true,},
-      { key: "unarrivedQty", title: "未到货数量", inputType: "Input", disabled:true,},
       { 
         key: "price",
         title: "无税单价",
-        inputType: "Input",
+        inputType: "InputNumber",
+        controlsPosition: "right",
         disabled:true,
+        width: 180,
+      },
+      { 
+        key: "notaxMoney", 
+        title: "无税金额", 
+        inputType: "InputNumber", 
+        controlsPosition: "right",
+        disabled:true,
+        width: 180,
       },
-      { key: "notaxMoney", title: "无税金额", inputType: "Input", disabled:true,},
       // { key: "priceSource", title: "价格目录ID", inputType: "Input", },
       { key: "isStorage", title: "入库关闭", inputType: "Checkbox", disabled:true, },
       { key: "isInvoice", title: "开票关闭", inputType: "Checkbox", disabled:true, },
@@ -705,11 +781,31 @@ export const TabColumns = [
       { key: "isBatchLock", title: "批号锁定标识", inputType: "Checkbox", },
       { key: "isReplenishment", title: "补单标识", inputType: "Checkbox", },
       { key: "isUrgency", title: "紧急标识", inputType: "Checkbox", },
-      { key: "originalQty", title: "原始数量", inputType: "Input", disabled:true,},
-      { key: "originalMoney", title: "原始金额", inputType: "Input", disabled:true,},
+      { 
+        key: "originalQty", 
+        title: "原始数量", 
+        inputType: "InputNumber", 
+        controlsPosition: "right",
+        disabled:true,
+        width: 180 ,
+      },
+      { 
+        key: "originalMoney", 
+        title: "原始金额", 
+        inputType: "InputNumber", 
+        controlsPosition: "right",
+        disabled:true,
+        width: 180,
+      },
       { key: "directProductBatch", title: "直运产品批号", inputType: "Input", width: 180 },
       { key: "discountRule", title: "折扣规则编码", inputType: "Input", width: 180 },
-      { key: "reservedQty", title: "预留数量", inputType: "Input", },
+      { 
+        key: "reservedQty", 
+        title: "预留数量", 
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        width: 180 ,
+       },
       { key: "reservedPeriod", title: "预留周期", inputType: "Input", },
       { 
         key: "taxDeductClassify", 
@@ -821,44 +917,50 @@ export const TabColumns = [
         title: "数量",
         inputType: "InputNumber",
         controlsPosition: "right",
-        width: 120,
+        width: 180,
         require: true,
       },
       { 
         key: "stroageQty", 
         title: "累计到货主数量", 
-        inputType: "Input", 
-        width: 120 
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        width: 180, 
       },
       { 
         key: "stockQty", 
         title: "累计入库主数量", 
-        inputType: "Input", 
-        width: 120 
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        width: 180, 
       },
       { 
         key: "invoiceQty", 
         title: "累计开票主数量", 
-        inputType: "Input", 
-        width: 120 
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        width: 180, 
       },
       { 
         key: "rollbackQty", 
         title: "累计退货主数量", 
-        inputType: "Input", 
-        width: 120 
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        width: 180, 
       },
       { 
         key: "backStockQty", 
         title: "累计退库主数量", 
-        inputType: "Input", 
-        width: 120 
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        width: 180, 
       },
       { 
         key: "floatQty", 
         title: "未到货数量", 
-        inputType: "Input", 
-        width: 120 
+        inputType: "InputNumber",
+        controlsPosition: "right",
+        width: 180, 
       },
       { 
         key: "createByName", 

src/views/purchase/task/column.js

@@ -40,6 +40,7 @@ export const TableColumns = [
   { key: "source", title: "需求来源" },
   // { key: "customer", title: "收货客户" },
   { key: "customerName", title: "收货客户" },
+  { key: "assignSupplierName", title: "指定供应商" },
   // { key: "puUnit", title: "采购单位" },
 
   { key: "demandDate", title: "需求时间" },
@@ -62,7 +63,6 @@ export const TableColumns = [
   { key: "baskCause", title: "退回原因" },
   { key: "backDate", title: "退回日期" },
   // { key: "assignSupplier", title: "指定供应商" },
-  { key: "assignSupplierName", title: "指定供应商" },
   // { key: "unit", title: "单位" },
   { key: "unitName", title: "单位" },
   // { key: "file", title: "附件" },

src/views/purchase/task/first-direct/column.js

@@ -20,7 +20,7 @@ export const TableColumns = [
   { key: "effectiveDate", title: "价格生效日期" },
   { key: "endDate", title: "价格失效日期" },
   {
-    key: "tax",
+    key: "newTax",
     title: "税率",
     inputType: "ComputedInput",
     width: 200,

src/views/purchase/task/index.vue

@@ -122,7 +122,13 @@ export default {
       await open(prop);
     },
     hasPowerDirect(prop) {
-      return !!prop.length;
+      if (prop.length === 1) {
+        const [{ status }] = prop;
+        if (status === "1") return false;
+        else return true;
+      } else {
+        return !!prop.length;
+      }
     },
     // 导 出
     async useExport(prop, page) {

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>