diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html b/ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html index e2c44cef..fb6c8b38 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html +++ b/ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html @@ -5,22 +5,245 @@ +
-

业务绩效配置

-
- -
-
- 超过 至 +

业务绩效配置

+ +
+
+

个人绩效（业务员、业务经理、业务主管）

+
+ +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+
+
+
+

团队绩效（业务经理）

+
+
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
-
- - +
+
+

团队绩效（业务主管）

+
+
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+
+
+
+

业务服务员（业务服务员）

+
+
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
+ 超过 + + 至 + + 以内* + +
+
-
@@ -28,6 +251,16 @@ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html index 6b864709..820d7412 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html @@ -44,17 +44,17 @@
@@ -75,97 +75,56 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", - modalName: "发货通知单详情", - columns: [{ - checkbox: true - }, - { - field: 'deliveryGoodsDetailId', - title: '发货通知单详情id', - visible: false - }, - { - field: 'noticeOrderNumber', - title: '通知单号', - visible: false - }, - { - field: 'salesOrderNumber', - title: '订单号码' - }, - { - field: 'enterpriseCode', - title: '客户代码', - visible: false - }, - { - field: 'enterpriseName', - title: '客户名称', - visible: false - }, - { - field: 'finishProductCode', - title: '成品代码' - }, - { - field: 'finishProductName', - title: '成品名称' - }, - { - field: 'specificationModel', - title: '规格型号' - }, - { - field: 'customerNumber', - title: '客户料号' - }, - { - field: 'typeMachine', - title: '机种', - visible: false - }, - { - field: 'inventoryUnit', - title: '单位' - }, - { - field: 'productQuantity', - title: '数量' - }, - { - field: 'commonCurrency', - title: '币别' - }, - { - field: 'processPrice', - title: '单价' - }, - { - field: 'amountMoney', - title: '金额' - }, - { - field: 'salesExplain', - title: '说明' - }, - { - field: 'line', - title: '订单项次' - }, - { - field: 'versionNumber', - title: '版本号' - }, - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); + modalName: "出货通知单列表", + fixedColumns:true, + fixedRightNumber:1, + columns: [ + {checkbox: true}, + {field: 'deliveryGoodsDetailId',title: '发货通知单详情id', visible: false}, + {title: '出库单号',field: 'noticeOrderNumber',visible: false}, + {title: '出货状态',field: 'deliveryGoodsFlag',visible: false, + formatter: function(value, row, index) { + return $.table.selectDictLabel(deliveryGoodsFlagDatas, value); + } + }, + {title: '员工ID',field: 'staffNo',visible: false}, + {title: '业务员',field: 'saleStaff'}, + {title: '关联出库单号',field: '',}, + {title: '订单类型',field: '',}, + {title: '客户ID',field: 'enterpriseCode'}, + {title: '客户公司名称',field: 'enterpriseName'}, + {title: '联系人',field: 'customerContact',visible: false}, + {title: '客户厂区',field: 'customerFactory',visible: false}, + {title: '客户订单号',field: '',}, + {title: '物料总量数量合计',field: '',}, + {title: '国内汇率',field: 'rmbTax',visible: false}, + {title: '美元汇率',field: 'usdTax',visible: false}, + {title: '不含税总价(RMB)',field: 'noRmbSum'}, + {title: '含税总价(RMB)',field: 'rmbSum'}, + {title: '付款条件',field: 'paymentTerms'}, + {title: '国内汇率',field: ''}, + {title: '美元汇率',field: ''}, + {title: '不含税总价(RMB)',field: ''}, + {title: '含税总价(RMB)',field: ''}, + {title: '不含税总价(美元)',field: ''}, + {title: '计划交付时间',field: ''}, + {title: '客户验收时间',field: ''}, + {title: '付款条件',field: ''}, + {title: '交付条件',field: ''}, + {title: '收货人联系人联系电话',field: ''}, + {title: '送货日期',field: 'deliveryDate'}, + {title: '收货地址',field: 'deliveryAddress'}, + { + title: '操作', + align: 'center', + formatter: function(value, row, index) { + var actions = []; + actions.push('编辑 '); + actions.push('删除'); + return actions.join(''); + } } - }] + ] }; $.table.init(options); }); diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html index 7563fbaa..8c431fbf 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html @@ -1,7 +1,7 @@ - + @@ -13,34 +13,38 @@
  • - +
  • - - + +
  • - - + +
  • - - + +
    • -
  • - - +
  • + + +
    • +
  • + +
    • -
  • - - +
  • + + +
    • +
  • + + + - +
  •  搜索 @@ -52,7 +56,7 @@
@@ -87,98 +91,62 @@ removeUrl: prefix + "/remove", exportUrl: prefix + "/export", clickToSelect: true, - modalName: "发货通知单", - columns: [{ - checkbox: true - }, - { - field: 'deliveryGoodsNoticeId', - title: '发货通知单id', - visible: false - }, - { - field: 'noticeOrderNumber', - title: '通知单号' - }, - { - field: 'deliveryDate', - title: '发货日期' - }, - { - field: 'enterpriseCode', - title: '客户代码' - }, - { - field: 'enterpriseName', - title: '客户名称' - }, - { - field: 'customerContact', - title: '联系人' - }, - { - field: 'customerFactory', - title: '客户厂区' - }, - { - field: 'deliveryAddress', - title: '送货地址' - }, - { - field: 'exportSales', - title: '内外销', - visible: false, - formatter: function(value, row, index) { - return $.table.selectDictLabel(exportSalesDatas, value); - } - }, - { - field: 'stockNumber', - title: '仓库编号' - }, - { - field: 'stockName', - title: '仓库名称' - }, - { - field: 'remarks', - title: '备注' - }, - { - field: 'voucherPreparation', - title: '制单人' - }, - { - field: 'deliveryGoodsFlag', - title: '发货否', - visible: false, - formatter: function(value, row, index) { - return $.table.selectDictLabel(deliveryGoodsFlagDatas, value); - } - }, - { - field: 'firstAddTime', - title: '录入时间', - formatter: function (value, row, index) { - if (value == null) { - return " "; - } else { - return value; - } - } - }, - { - field: 'updateInfoTime', - title: '上次修改时间', - formatter: function (value, row, index) { - if (value == null) { - return " "; - } else { - var vArr = value.split(',') - return vArr[0]; + modalName: "出货资料列表", + columns: [ + {checkbox: true}, + {field: 'deliveryGoodsNoticeId',title: '出货通知单Id',visible: false}, + {field: 'noticeOrderNumber',title: '出货通知单号'}, + {title: '资料类型',field: '',}, + {title: '模版类型',field: 'shipping_template',}, + {title: '员工ID',field: 'staffNo',visible: false}, + {title: '业务员',field: 'saleStaff'}, + {title: '关联出库单号',field: '',}, + {title: '订单类型',field: '',}, + {title: '客户ID',field: 'enterpriseCode'}, + {title: '客户公司名称',field: 'enterpriseName'}, + {title: '联系人',field: 'customerContact',visible: false}, + {title: '客户厂区',field: 'customerFactory',visible: false}, + {title: '客户订单号',field: '',}, + {title: '物料总量数量合计',field: '',}, + {title: '国内汇率',field: 'rmbTax',visible: false}, + {title: '美元汇率',field: 'usdTax',visible: false}, + {title: '不含税总价(RMB)',field: 'noRmbSum'}, + {title: '含税总价(RMB)',field: 'rmbSum'}, + {title: '付款条件',field: 'paymentTerms'}, + {title: '国内汇率',field: ''}, + {title: '美元汇率',field: ''}, + {title: '不含税总价(RMB)',field: ''}, + {title: '含税总价(RMB)',field: ''}, + {title: '不含税总价(美元)',field: ''}, + {title: '计划交付时间',field: ''}, + {title: '客户验收时间',field: ''}, + {title: '付款条件',field: ''}, + {title: '交付条件',field: ''}, + {title: '收货人联系人联系电话',field: ''}, + {title: '送货日期',field: 'deliveryDate'}, + {title: '收货地址',field: 'deliveryAddress'}, + {title: '仓库编号',field: 'stockNumber',visible: false}, + {title: '仓库名称',field: 'stockName',visible: false}, + {title: '备注',field: 'remarks'}, + {title: '出货状态',field: 'deliveryGoodsFlag',visible: false, + formatter: function(value, row, index) { + return $.table.selectDictLabel(deliveryGoodsFlagDatas, value); } + }, + {title: '内外销',field: 'exportSales',visible: false, + formatter: function(value, row, index) {return $.table.selectDictLabel(exportSalesDatas, value);} + }, + {title: '发货否',field: 'deliveryGoodsFlag',visible: false, + formatter: function(value, row, index) {return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);} + }, + {title: '录入时间',field: 'createTime', + formatter: function (value, row, index) {if (value == null) {return " ";} else {return value;}} + }, + {title: '更新人',field: 'updateBy',visible: false}, + {title: '上次修改时间',field: 'updateTime', + formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(',');return vArr[0];}} } - }] + ] }; $.table.init(options); }); @@ -246,11 +214,8 @@ window.URL.revokeObjectURL(URL)//释放内存 }) }); - - } } - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html b/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html index 6288f87a..85f2ebbf 100644 --- a/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html +++ b/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html @@ -74,15 +74,15 @@
- + 添加 - - 修改 - - - 删除 - + 导出 @@ -117,90 +117,40 @@ columns: [{ checkbox: true }, - { - field: 'oderId', - title: '开发修改单编号', - visible: false - }, - { - field: 'developOdercode', - title: '开发修改单单号' - }, - { - field: 'materialNo', - title: '料号' - }, - { - field: 'eceiptStatus', - title: '采购入库状态' - }, - { - field: 'qualityStatus', - title: '品质状态' - }, { field: 'auditStatus', title: '审核状态', formatter: function(value, row, index) { - return $.table.selectDictLabel(auditStatusDatas, value); - } - }, - { - field: 'completeStatus', - title: '完成状态' - }, - { - field: 'materialName', - title: '物料名称' - }, - { - field: 'materialType', - title: '物料类型', - formatter: function(value, row, index) { - return $.table.selectDictLabel(materialTypeDatas, value); + return $.table.selectDictLabel(auditStatusDatas, value); } }, - { - field: 'unit', - title: '单位', - formatter: function(value, row, index) { - return $.table.selectDictLabel(unitDatas, value); - } - }, - { - field: 'photoUrl', - title: '图片地址' - }, - { - field: 'brand', - title: '品牌' - }, - { - field: 'describe', - title: '描述' - }, - { - field: 'processMethod', - title: '加工方式', - formatter: function(value, row, index) { - return $.table.selectDictLabel(processMethodDatas, value); - } - }, - { - field: 'createBy', - title: '工程员' - }, - { - field: 'createTime', - title: '录入时间' - }, - { - field: 'remark', - title: '备注信息' - }, - { - title: '操作', - align: 'center', + {field: 'completeStatus',title: '完成状态'}, + {field:'',title:'确认状态'}, + {field: 'oderId', title: '开发修改单编号',visible: false}, + {field: 'developOdercode',title: '开发修改单单号'}, + {field: 'eceiptStatus',title: '采购入库状态'}, + {field: 'qualityStatus',title: '品质状态'}, + {field: 'staffNo', title: '员工ID', visible: false}, + {field: 'saleStaff', title: '工程员'}, + {field: 'materialNo',title: '料号'}, + {field: 'completeStatus',title: '完成状态'}, + {field: 'materialName',title: '物料名称'}, + {field: 'materialType',title: '物料类型', + formatter: function(value, row, index) {return $.table.selectDictLabel(materialTypeDatas, value);} + }, + {field: 'unit',title: '单位', + formatter: function(value, row, index) {return $.table.selectDictLabel(unitDatas, value);} + }, + {field: 'photoUrl',title: '图片地址'}, + {field: 'brand',title: '品牌'}, + {field: 'describe',title: '描述'}, + {field: 'processMethod',title: '加工方式', + formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);} + }, + {field: 'createBy',title: '录入人'}, + {field: 'createTime',title: '录入时间'}, + {field: 'remark',title: '备注信息'}, + {title: '操作',align: 'center', formatter: function(value, row, index) { var actions = []; actions.push('编辑 ');