Skip to content

朱继来 / 后台订单管理

Go to a project
Commit a88c9a71 by 朱继来
Options

Merge branch 'hcy_pcb_20181221' into 'master' 

Hcy pcb 20181221

See merge request !30
parents 515cd2cd 84a6f0dd
Inline Side-by-side
Showing with 2258 additions and 896 deletions
.gitignore
Homestead.yaml Homestead.yaml
Homestead.json Homestead.json
.env .env
/.idea
.idea/Order.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/blade.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BladeInjectionConfiguration" escapedTextEnd="!!}" escapedTextStart="{!!" />
</project>
\ No newline at end of file
.idea/copyright/profiles_settings.xml deleted 100644 → 0
<component name="CopyrightManager">
<settings default="" />
</component>
\ No newline at end of file
.idea/misc.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<OptionsSetting value="true" id="添加" />
<OptionsSetting value="true" id="移除" />
<OptionsSetting value="true" id="签出" />
<OptionsSetting value="true" id="更新" />
<OptionsSetting value="true" id="状态" />
<OptionsSetting value="true" id="编辑" />
<ConfirmationsSetting value="0" id="添加" />
<ConfirmationsSetting value="0" id="移除" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Order.iml" filepath="$PROJECT_DIR$/.idea/Order.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js" line="7" />
</component>
<component name="ChangeListManager">
<list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/PaymentDaysList.js" afterPath="$PROJECT_DIR$/public/js/PaymentDaysList.js" />
</list>
<ignored path="Order.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path=".idea/dataSources.local.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FavoritesManager">
<favorites_list name="Order" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="PaymentDaysList.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="600">
<caret line="27" column="43" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PaymentDaysList.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473">
<caret line="51" column="32" selection-start-line="51" selection-start-column="32" selection-end-line="51" selection-end-column="32" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4625">
<caret line="185" column="62" selection-start-line="185" selection-start-column="62" selection-end-line="185" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AuthPaymentDays.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="68" column="17" selection-start-line="68" selection-start-column="17" selection-end-line="68" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="header.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="website.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="50" column="19" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AuthPaymentDays.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="15" column="33" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="33" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ApiController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389">
<caret line="31" column="154" selection-start-line="31" selection-start-column="154" selection-end-line="31" selection-end-column="154" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PaymentDaysModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="30" column="67" selection-start-line="30" selection-start-column="67" selection-end-line="30" selection-end-column="67" />
<folding>
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="JavaScript File" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/Http/Controllers/PaymentDaysController.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/config/website.php" />
<option value="$PROJECT_DIR$/config/perm.php" />
<option value="$PROJECT_DIR$/app/Http/routes.php" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays.blade.php" />
<option value="$PROJECT_DIR$/public/js/common.min.js" />
<option value="$PROJECT_DIR$/config/app.php" />
<option value="$PROJECT_DIR$/composer.json" />
<option value="$PROJECT_DIR$/app/Http/Controllers/WebController.php" />
<option value="$USER_HOME$/AppData/Local/Temp/scp20036/public/js/FootStone/UploadMonopolyFile.js" />
<option value="$PROJECT_DIR$/resources/views/layouts/header.blade.php" />
<option value="$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js" />
<option value="$PROJECT_DIR$/public/js/AuthPaymentDays.js" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" />
<option value="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php" />
<option value="$PROJECT_DIR$/public/js/PaymentDaysList.js" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" />
<component name="JsBuildToolPackageJson" detection-done="true" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<gulpfiles>
<GulpfileState>
<gulpfile-path>$PROJECT_DIR$/gulpfile.js</gulpfile-path>
</GulpfileState>
</gulpfiles>
</component>
<component name="PhpServers">
<servers />
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="68" />
<option name="y" value="-8" />
<option name="width" value="1860" />
<option name="height" value="1096" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<OptionsSetting value="true" id="添加" />
<OptionsSetting value="true" id="移除" />
<OptionsSetting value="true" id="签出" />
<OptionsSetting value="true" id="更新" />
<OptionsSetting value="true" id="状态" />
<OptionsSetting value="true" id="编辑" />
<ConfirmationsSetting value="0" id="添加" />
<ConfirmationsSetting value="0" id="移除" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
<manualOrder />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PaymentDays" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Model" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\project\Order\public\js" />
</key>
</component>
<component name="RunManager">
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
<configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
<TestRunner />
<method />
</configuration>
<configuration default="true" type="PhpBehatConfigurationType" factoryName="Behat">
<BehatRunner />
<method />
</configuration>
<configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
<arguments />
<envs />
<method />
</configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
<command value="run-script" />
<scripts />
<node-interpreter value="project" />
<envs />
<method />
</configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="" />
<created>1539065019417</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1539065019417</updated>
<workItem from="1539065020769" duration="33480000" />
<workItem from="1539167536899" duration="1228000" />
<workItem from="1539327663189" duration="3659000" />
<workItem from="1539332944482" duration="2229000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="41882000" />
</component>
<component name="ToolWindowManager">
<frame x="68" y="-8" width="1860" height="1096" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2516269" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="调试" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="运行" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="1" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650">
<caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="18" column="122" selection-start-line="18" selection-start-column="122" selection-end-line="18" selection-end-column="122" />
<folding>
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
<caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="50" column="19" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="6" column="59" selection-start-line="6" selection-start-column="59" selection-end-line="6" selection-end-column="59" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1000">
<caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js" />
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/maatwebsite/excel/src/Maatwebsite/Excel/Facades/Excel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="639">
<caret line="202" column="46" selection-start-line="202" selection-start-column="46" selection-end-line="202" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1000">
<caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1975">
<caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="50" column="19" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41875">
<caret line="1684" column="50" selection-start-line="1684" selection-start-column="45" selection-end-line="1684" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="6" column="59" selection-start-line="6" selection-start-column="59" selection-end-line="6" selection-end-column="59" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
<caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650">
<caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="18" column="122" selection-start-line="18" selection-start-column="122" selection-end-line="18" selection-end-column="122" />
<folding>
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2675">
<caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825">
<caret line="33" column="9" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Function.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PromptController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="22" column="37" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Middleware/CheckLogin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1200">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/index/js.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="23" column="2" selection-start-line="23" selection-start-column="2" selection-end-line="23" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/amount.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="17" column="34" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderCountController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="124" column="25" selection-start-line="124" selection-start-column="20" selection-end-line="124" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="767">
<caret line="37" column="29" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/perm.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="950">
<caret line="80" column="34" selection-start-line="80" selection-start-column="34" selection-end-line="80" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/routes.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="614">
<caret line="101" column="85" selection-start-line="101" selection-start-column="85" selection-end-line="101" selection-end-column="85" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Function.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="186" column="13" selection-start-line="186" selection-start-column="13" selection-end-line="186" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="564">
<caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/common.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3075">
<caret line="125" column="1" selection-start-line="125" selection-start-column="1" selection-end-line="125" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41875">
<caret line="1684" column="50" selection-start-line="1684" selection-start-column="45" selection-end-line="1684" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2675">
<caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/scp20036/public/js/FootStone/UploadMonopolyFile.js" />
<entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="50" column="19" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js" />
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4625">
<caret line="185" column="62" selection-start-line="185" selection-start-column="62" selection-end-line="185" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="68" column="17" selection-start-line="68" selection-start-column="17" selection-end-line="68" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389">
<caret line="31" column="154" selection-start-line="31" selection-start-column="154" selection-end-line="31" selection-end-column="154" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="30" column="67" selection-start-line="30" selection-start-column="67" selection-end-line="30" selection-end-column="67" />
<folding>
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="15" column="33" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="33" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="600">
<caret line="27" column="43" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473">
<caret line="51" column="32" selection-start-line="51" selection-start-column="32" selection-end-line="51" selection-end-column="32" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
app/Http/Controllers/ApiController.php
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Model\PaymentDaysModel; use App\Model\PaymentDaysModel;
use App\Model\Pcb\PcbOrderModel;
use App\Model\Pcb\PcbPublicModel;
use App\Model\Pcb\PcbPurchaseModel;
use App\Model\Pcb\PcbServerModel;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Requests; use App\Http\Requests;
...@@ -46,4 +50,36 @@ class ApiController extends Controller ...@@ -46,4 +50,36 @@ class ApiController extends Controller
$Model=new PaymentDaysModel(); $Model=new PaymentDaysModel();
$this->Export($Model->ApiAuthPaymentDays($request->user->userId)); $this->Export($Model->ApiAuthPaymentDays($request->user->userId));
} }
//pcb订单列表
private function ApiPcbOrderList($request){
$this->ExportLayui((new PcbOrderModel())->getList());
}
//pcb订单列表导出
private function ApiPcbOrderListExport($request){
((new PcbOrderModel())->export());
}
//pcb客服点击确定发货
private function ApiSendStock($request){
$this->Export((new PcbPublicModel())->orderShipping($request->user->userId,$request->all()));
}
//pcb客服点击转采购
private function ApiAddPurchase($request){
echo (new PcbServerModel())->AddPurchase($request->user->userId,$request->input("order_id"));
}
//pcb客服审核订单，反馈给前台
private function ApiAuditOrder($request){
$this->Export((new PcbPublicModel())->auditOrder($request->user->userId,$request->input("order_id"),$request->input("order_sn"),$request->input("content")));
}
//pcb订单列表
private function ApiPcbPurchaseList($request){
$this->ExportLayui((new PcbPurchaseModel())->getList());
}
//pcb订单列表导出
private function ApiPcbPurchaseListExport($request){
((new PcbPurchaseModel())->export());
}
//pcb后台点击采购确认
private function ApiConfirmOrder($request){
echo (new PcbServerModel())->confirmOrder($request->user->userId,$request->input("purchase_id"),$request->input("status"));
}
} }
app/Http/Controllers/RegionController.php
...@@ -37,4 +37,12 @@ class RegionController extends Controller ...@@ -37,4 +37,12 @@ class RegionController extends Controller
'towns'=> $towns 'towns'=> $towns
); );
} }
//获取省市县名称
public function getRegionName($region_id){
if (empty($region_id)){
return "";
}
$list = DB::connection('order')->table('lie_region')->select("region_name")->where("region_id",$region_id)->get();
return !$list ? "" : current(objectToArray($list))['region_name'];
}
} }
\ No newline at end of file
app/Http/Controllers/WebController.php
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Map\PcbOrderInvoiceMap;
use App\Map\PcbOrderMap;
use App\Map\PcbOrderShippingMap;
use App\Model\PaymentDaysModel; use App\Model\PaymentDaysModel;
use App\Model\Pcb\PcbPublicModel;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Requests; use App\Http\Requests;
...@@ -49,13 +53,13 @@ class WebController extends Controller ...@@ -49,13 +53,13 @@ class WebController extends Controller
public function info(Request $request,$id=''){ public function info(Request $request,$id=''){
$data=$this->getPageInfo($request); $data=$this->getPageInfo($request);
$data['id']=$id; $data['id']=$id;
return $this->$id($request, $data, 'PaymentDays'); return $this->$id($request, $data,$id );
} }
private function PaymentDaysList($request,$data,$id){ private function PaymentDaysList($request,$data,$id){
$data['title']='账期申请列表'; $data['title']='账期申请列表';
$data['Status']=[1=>'待审核',2=>'审核通过',3=>'审核不通过']; $data['Status']=[1=>'待审核',2=>'审核通过',3=>'审核不通过'];
return view($id,$data); return view('PaymentDays',$data);
} }
private function AuthPaymentDays($request,$data,$id){ private function AuthPaymentDays($request,$data,$id){
...@@ -64,6 +68,185 @@ class WebController extends Controller ...@@ -64,6 +68,185 @@ class WebController extends Controller
$data['paths'] = [["title" => '账期管理', "href" => '#'], ["title" => '申请列表', "href" => '/web/PaymentDaysList'], ["title" => '审核账期申请', "href" => '#']]; $data['paths'] = [["title" => '账期管理', "href" => '#'], ["title" => '申请列表', "href" => '/web/PaymentDaysList'], ["title" => '审核账期申请', "href" => '#']];
$Model=new PaymentDaysModel(); $Model=new PaymentDaysModel();
$data['info']=$Model->AuthPaymentDays(); $data['info']=$Model->AuthPaymentDays();
return view($id,$data); return view('PaymentDays',$data);
} }
//pcb 订单列表
private function PcbOrderList($request,$data,$id){
$data['title']='PCB交易列表';
$data['order_type'] = PcbOrderMap::$order_type;
$data['status'] = PcbOrderMap::$status;
$data['shipping'] = objectToArray(DB::connection("order")->table("lie_shipping")->get());
return view("Pcb",$data);
}
//pcb详情
private function PcbOrderDetail($request,$data,$id){
$data['title']='PCB订单详情';
$data['paths'] = [["title" => 'PCB管理', "href" => '#'], ["title" => 'PCB订单列表', "href" => '/web/PcbOrderList'], ["title" => 'PCB订单详情', "href" => '#']];
$order_id = $request->input("order_id");
$con = DB::connection('pcb');
//订单基本信息
$orderBase = $con->table('order')->where(['order_id' => $order_id])->first();
if (!$orderBase){
return [0,'不存在此订单'];
}
//采购信息
$purchase = $con->table('purchase')->where(['order_id' => $order_id])->first();
//订单收货人信息
$orderAddress = $con->table('order_address')->where(['order_id' => $order_id])->first();
//订单费用明细
$orderAuditDetail = $con->table('order_audit_detail')->where(['order_id' => $order_id])->first();
//采购审核意见备注
$orderAuditReason2 = $con->table('order_audit_reason')->where(['order_id' => $order_id,'type'=>2])->orderBy("id","desc")->first();
$orderAuditReason1 = $con->table('order_audit_reason')->where(['order_id' => $order_id,'type'=>1])->orderBy("id","desc")->first();
//订单详细信息
$orderInfo = $con->table('order_info')->where(['order_id' => $order_id])->first();
//订单发票信息
$orderInvoice = $con->table('order_invoice')->where(['order_id' => $order_id])->first();
//物流信息
$shipping = $con->table('shipping')->where(['relevance_id' => $order_id,'shipping_type'=>1])->first();
//查询操作日志
$actionLog = $con->table("action_log")->where(["type"=>1,'oid'=>$order_id])->orderBy("id","desc")->get();
$orderBase = objectToArray($orderBase);
$orderBase['tiaojia'] = "";
//拼接采购信息
if ($purchase){
$purchase= objectToArray($purchase);
if($purchase['purchase_amount'] == 0){
$orderBase['tiaojia'] = "";
}else{
if ( $purchase['purchase_amount'] > 0 && $purchase['purchase_amount'] != $purchase['order_amount']){
$orderBase['tiaojia'] = "是";
}else{
$orderBase['tiaojia'] = "否";
}
}
$purchase['shipping_time'] = $purchase['shipping_time'] > 0 ? date('Y-m-d H:i:s',$purchase['shipping_time']) : "";
$purchase['finish_time'] = $purchase['finish_time'] > 0 ? date('Y-m-d H:i:s',$purchase['finish_time']) : "";
$purchase['purchase_amount'] = $purchase['purchase_amount'] > 0 ? $purchase['purchase_amount'] : "";
}
//拼接基本信息
$PcbPublicModel = new PcbPublicModel();
$orderBase['order_pay_type'] = $PcbPublicModel->getPay($order_id);
$orderBase['order_type'] = PcbOrderMap::$order_type[$orderBase['order_type']];
$orderBase['status_name'] = PcbOrderMap::$status[$orderBase['status']];
$orderBase['create_time'] = $orderBase['create_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['create_time']) : "";
$orderBase['finish_time'] = $orderBase['finish_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['finish_time']) : "";
$orderBase['pay_time'] = $orderBase['pay_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['pay_time']) : "";
$userCompany = DB::connection('order')->table("lie_user_company")->where("user_id",$orderBase['user_id'])->first();
$orderBase['company_name'] = $userCompany ? $userCompany->com_name : "" ;
//拼接收货信息
$RegionController = new RegionController();
if ($orderAddress){
$orderAddress = objectToArray($orderAddress);
$orderAddress['province'] = $RegionController->getRegionName($orderAddress['province']);
$orderAddress['city'] = $RegionController->getRegionName($orderAddress['city']);
$orderAddress['district'] = $RegionController->getRegionName($orderAddress['district']);
}
//拼接发票信息
if ($orderInvoice){
$orderInvoice = objectToArray($orderInvoice);
$orderInvoice['province'] = $RegionController->getRegionName($orderInvoice['consignee_province']);
$orderInvoice['city'] = $RegionController->getRegionName($orderInvoice['consignee_city']);
$orderInvoice['district'] = $RegionController->getRegionName($orderInvoice['consignee_district']);
$orderInvoice['inv_type'] = PcbOrderInvoiceMap::$inv_type[$orderInvoice['inv_type']];
$orderInvoice['invoice_status'] = PcbOrderInvoiceMap::$invoice_status[$orderInvoice['invoice_status']];
}
//拼接订单详细信息
$orderInfo = objectToArray($orderInfo);
$orderInfo['teshu'] = "是否有半孔工艺:".($orderInfo['sp_half_hole'] == 1 ? "是":"否")." 是否要金手指:".($orderInfo['sp_goldfingers'] == 1 ? "是":"否").$orderInfo['sp_goldfingers_bevelling'].$orderInfo['sp_UL_marking']; //特殊工艺
$data['orderBase'] = $orderBase;
$data['purchase'] = $purchase;
$data['orderAddress'] = $orderAddress;
$data['orderAuditDetail'] = objectToArray($orderAuditDetail);
$data['orderAuditReason1'] = objectToArray($orderAuditReason1);
$data['orderAuditReason2'] = objectToArray($orderAuditReason2);
$data['orderInfo'] = objectToArray($orderInfo);
$data['orderInvoice'] = $orderInvoice;
$data['shipping'] = objectToArray($shipping);
$data['actionLog'] = objectToArray($actionLog);
return view("Pcb",$data);
}
//pcb 采购列表
private function PcbPurchaseList($request,$data,$id){
$data['title']='PCB交易列表';
$data['order_type'] = PcbOrderMap::$order_type;
$data['status'] = PcbOrderMap::$status;
return view("Pcb",$data);
}
//pcb详情
private function PcbPurchaseDetail($request,$data,$id){
$data['title']='PCB采购详情';
$data['paths'] = [["title" => 'PCB管理', "href" => '#'], ["title" => 'PCB采购列表', "href" => '/web/PcbPurchaseList'], ["title" => 'PCB采购详情', "href" => '#']];
$purchase_id = $request->input("purchase_id");
$order_id = $request->input("order_id");
$con = DB::connection('pcb');
//订单基本信息
$orderBase = $con->table('order')->where(['order_id' => $order_id])->first();
if (!$orderBase){
return [0,'不存在此采购单'];
}
//采购信息
$purchase = $con->table('purchase')->where(['order_id' => $order_id])->first();
//订单费用明细
$orderAuditDetail = $con->table('order_audit_detail')->where(['order_id' => $order_id])->first();
//订单详细信息
$orderInfo = $con->table('order_info')->where(['order_id' => $order_id])->first();
//订单发票信息
$orderInvoice = $con->table('order_invoice')->where(['order_id' => $order_id])->first();
//物流信息
$shipping = $con->table('shipping')->where(['relevance_id' => $purchase_id,'shipping_type'=>3])->first();
//供应商审核结果
$orderAuditReason2 = $con->table('order_audit_reason')->where(['order_id' => $order_id,'type'=>2])->orderBy("id","desc")->first();
//查询操作日志
$actionLog = $con->table("action_log")->where(["type"=>1,'oid'=>$order_id])->orderBy("id","desc")->get();
//拼接基本信息
$orderBase = objectToArray($orderBase);
$orderBase['order_type'] = PcbOrderMap::$order_type[$orderBase['order_type']];
$orderBase['status_name'] = PcbOrderMap::$status[$orderBase['status']];
$orderBase['create_time'] = $orderBase['create_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['create_time']) : "";
$orderBase['finish_time'] = $orderBase['finish_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['finish_time']) : "";
$orderBase['pay_time'] = $orderBase['pay_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['pay_time']) : "";
$userCompany = DB::connection('order')->table("lie_user_company")->where("user_id",$orderBase['user_id'])->first();
$orderBase['company_name'] = $userCompany ? $userCompany->com_name : "" ;
//拼接采购信息
if ($purchase){
$purchase = objectToArray($purchase);
$purchase['shipping_time'] = $purchase['shipping_time'] > 0 ? date('Y-m-d H:i:s',$purchase['shipping_time']) : "";
$purchase['purchase_amount'] = $purchase['purchase_amount'] > 0 ? $purchase['purchase_amount'] : "";
$purchase['order_pay_type'] = PcbOrderMap::$order_pay_type[$purchase['order_pay_type']];
if($purchase['purchase_amount'] == 0){
$orderBase['tiaojia'] = "";
}else{
if ( $purchase['purchase_amount'] > 0 && $purchase['purchase_amount'] != $purchase['order_amount']){
$orderBase['tiaojia'] = "是";
}else{
$orderBase['tiaojia'] = "否";
}
}
}
//拼接订单详细信息
$orderInfo = objectToArray($orderInfo);
$orderInfo['teshu'] = "是否有半孔工艺:".($orderInfo['sp_half_hole'] == 1 ? "是":"否")." 是否要金手指:".($orderInfo['sp_goldfingers'] == 1 ? "是":"否").$orderInfo['sp_goldfingers_bevelling'].$orderInfo['sp_UL_marking']; //特殊工艺
$data['orderBase'] = $orderBase;
$data['purchase'] = $purchase;
$data['liexinInfo'] = config("params.liexin_info");
$data['orderAuditDetail'] = objectToArray($orderAuditDetail);
$data['orderAuditReason2'] = objectToArray($orderAuditReason2);
$data['orderInfo'] = objectToArray($orderInfo);
$data['orderInvoice'] = $orderInvoice;
$data['shipping'] = objectToArray($shipping);
$data['actionLog'] = objectToArray($actionLog);
return view("Pcb",$data);
}
} }
app/Http/Function.php
...@@ -208,6 +208,7 @@ ...@@ -208,6 +208,7 @@
$ret .= '<li><a href="#">' . $menus[$actives[0]]->title . '</a></li>'; $ret .= '<li><a href="#">' . $menus[$actives[0]]->title . '</a></li>';
} }
} }
return $ret; return $ret;
} }
...@@ -271,3 +272,118 @@ ...@@ -271,3 +272,118 @@
$actives = []; $actives = [];
return createMenuReal($menus, $actives, 0); return createMenuReal($menus, $actives, 0);
} }
//过滤数据
function TrimX($data='',$empty=true,$arr=false){
if(is_array($data)){
foreach ($data as $k=>$v){
if(!empty($v) && $v!=0 && !is_array($v)){
$data[$k]=trim($v);
}
if($empty==true){
if((empty($v) && $v!=0) || $v=='undefined' || $v==null){
unset($data[$k]);
}
}
if(is_array($arr) && count($arr)>0 && count($data)>0){
if(!in_array($k,$arr)){
unset($data[$k]);
}
}
}
}else{
$data=trim($data);
}
return $data;
}
/**
* 导出CSV文件
* @param array $data 数据
* @param array $header_data 首行数据
* @param string $file_name 文件名称
* @return string
*/
function export_csv($data = [], $header_data = [], $file_name = '')
{
set_time_limit(0);
header('Content-Type: application/vnd.ms-excel');
header('Content-Disposition: attachment;filename='.$file_name);
header('Cache-Control: max-age=0');
$fp = fopen('php://output', 'a');
if (!empty($header_data)) {
foreach ($header_data as $key => $value) {
$header_data[$key] = iconv('utf-8', 'gbk', $value);
}
fputcsv($fp, $header_data);
}
$num = 0;
$limit = 100000; //每隔$limit行，刷新一下输出buffer，不要太大，也不要太小
$count = count($data); //逐行取出数据，不浪费内存
if ($count > 0) {
for ($i = 0; $i < $count; $i++) {
$num++;
//刷新一下输出buffer，防止由于数据过多造成问题
if ($limit == $num) {
ob_flush();
flush();
$num = 0;
}
$row = $data[$i];
foreach ($row as $key => $value) {
$row[$key] = iconv('utf-8', 'gbk', $value);
}
fputcsv($fp, $row);
}
}
fclose($fp);exit;
}
/*
*所有变量转字符串
*/
function changeToStr($str){
return sprintf("'%s'", $str);
}
/*
* 取二维数组某一列的值生成以逗号分隔的字符串,如：$data = ['0'=>['uid'=>'1313','name'=>121]，'1'=>['uid'=>'1414','name'=>121]]
转换后变为：arrayTostr($data,'uid') =》1313，1414
* @param array $data 要取值的数组
* @param string $s 下标：如 uid
* @param string $type 类型，1为控制返回null，2 返回数字
* @return str
*/
function arrayToCommaStr($data,$col,$type=''){
switch ($type){
case 1: //如果计算后的值是空，返回空
return array_filter(array_column($data,$col));
break;
case 2:
$arr = array_unique(array_column($data,$col));
return $res = implode(',',$arr);
break;
case 3:
$arr = array_filter(array_column($data,$col));
$res = implode(',',array_map('changeToStr',$arr)); //回调本类中的changeToStr 函数
return $res == "" ? "NULL" : $res;
break;
default:
$arr = array_filter(array_column($data,$col));
$res = implode(',',array_map('changeToStr',$arr)); //回调本类中的changeToStr 函数
return $res;
break;
}
}
/**
* 对象转换数组
*
* @param $e StdClass对象实例
* @return array|void
*/
function objectToArray($e)
{
$e = (array)$e;
foreach ($e as $k => $v) {
if (gettype($v) == 'resource') return;
if (gettype($v) == 'object' || gettype($v) == 'array')
$e[$k] = (array)objectToArray($v);
}
return $e;
}
\ No newline at end of file
app/Map/PcbOrderInvoiceMap.php 0 → 100644
<?php
namespace App\Map;
class PcbOrderInvoiceMap{
//发票类型 2普通发票 3增值税专用发票 4增值税普通发票',
public static $inv_type=[
"1"=>"不开票",
"2"=>"普通发票",
"3"=>"增值税专用发票",
"4"=>"增值税普通发票",
];
/*
* 开票状态 0待确认 1已开票 2已发货 3已签收
*/
public static $invoice_status = [
'0'=>'待确认',
'1'=>'已开票',
'2'=>'已发货',
'3'=>'已签收',
];
}
\ No newline at end of file
app/Map/PcbOrderMap.php 0 → 100644
<?php
namespace App\Map;
class PcbOrderMap{
//类型 ：1付预付款单 2退预付款单 3收款 4付款
//订单状态
public static $status=[
"-1"=>"已取消",
"1"=>"已提交",
"2"=>"采购中",
"3"=>"采购完成待确认",
"4"=>"确认不通过",
"10"=>"待支付",
"11"=>"支付完成",
"12"=>"生产中",
"13"=>"生产完成",
"14"=>"已发货到猎芯",
"15"=>"已发货给客户",
"20"=>"交易完成",
];
/*
* 支付方式
*/
public static $order_pay_type =[
'0'=> "",
'1'=>'微信支付',
'2'=>'支付宝',
'3'=>'银联支付(B2B)',
'4'=>'银联支付(B2C)',
'5'=>'账期支付',
'6'=>'京东支付',
'7'=>'交通银行',
'8'=>'恒生银行',
];
/*
* 类型：1样板 2小批量
*/
public static $order_type = [
'1'=>'样版',
'2'=>'小批量',
];
}
\ No newline at end of file
app/Map/PcbOrderShippingMap.php 0 → 100644
<?php
namespace App\Map;
class PcbOrderShippingMap{
//发货信息：-1 未配送 1 配送中 2 已签
public static $status=[
"-1"=>"未配送",
"1"=>"配送中",
"2"=>"已签",
];
}
\ No newline at end of file
app/Model/Pcb/PcbActionLogModel.php 0 → 100644
<?php
namespace App\Model\Pcb;
use App\Map\PcbOrderMap;
use Illuminate\Database\Eloquent\Model;
use Request;
use DB;
class PcbActionLogModel extends Model
{
protected $connection='pcb';
protected $table='action_log';
protected $primaryKey='id';
public $timestamps = false;
/*
* 插入操作日志
* @param `type` '1 订单 2 采购单 ',
* @param `action` '操作 增删改查',
* @param `content` '操作内容',
* @param `remark` '操作备注',
* @param `oid` 关联ID
* @param `uid` '操作用户id',
* @param `user_name` '操作用户名称',
* @return
*/
static function log($type,$action="",$content="",$remark="",$oid = 0,$uid = 0){
$data['type'] = $type ;
$data['action'] = $action ;
$data['content'] = is_array($content) ? json_encode($content,JSON_UNESCAPED_UNICODE) : $content;
$data['remark'] = $remark;
$data['uid'] = $uid;
$data['oid'] = $oid;
$data['user_name'] = (new PcbPublicModel())->getAdminName($uid);
$data['create_time'] = time();
return self::insert($data);
}
}
\ No newline at end of file
app/Model/Pcb/PcbOrderModel.php 0 → 100644
<?php
namespace App\Model\Pcb;
use App\Map\PcbOrderMap;
use Illuminate\Database\Eloquent\Model;
use Request;
use DB;
class PcbOrderModel extends Model
{
protected $connection='pcb';
protected $table='order';
protected $primaryKey='id';
public $timestamps = false;
//列表
public function getList($type =1)
{
$arr = ['p', 'limit','self','start_time','end_time','status',"user_account","order_sn","purchase_sn","order_type","adtag","ptag"];
$input = Request::only($arr);
$input=TrimX($input,true,$arr);
// //查询数据\
$list = $this->where(function ($query) use ($input) {
$PcbPurchaseModel = new PcbPurchaseModel();
foreach ($input as $k => $v){
$v = trim($v);
switch ($k){
case "p":
case "limit":
case "_url":
continue;
break;
case "start_time":
$query->where('create_time', '>=', strtotime($v));
break;
case "end_time":
$query->where('create_time', '<=',strtotime($v));
break;
case "end_time":
$query->where('create_time', '<=',strtotime($v));
break;
case "purchase_sn":
$items = $PcbPurchaseModel->select("order_id")->where("purchase_sn","like","%".$v."%")->get();
if ($items->count()){
$orderIds = arrayToCommaStr($items->toArray(),'order_id',1);
$query->whereIn("order_id",$orderIds);
}else{
$query->where("order_id",0);
}
break;
default:
$query->whereIn($k, explode(',',trim($v,',')));
break;
}
}
})->orderBy('order_id','desc');
//getSql();
if ($type == 1){
$list = $list->paginate($input['limit'], ['*'], 'p', $input['p'])->toArray();
if (!$list) return [20001, '没有数据'];
$data = $this->clearData($list['data']);
return [0, '成功', $data, $list['total']];
}else{
return $this->clearData($list->get()->toArray());
}
}
//清洗列表数据
private function clearData($data){
if (!is_array($data) || count($data) == 0 || $data == ""){
return [];
}
$PcbPurchaseModel = new PcbPurchaseModel();
$PcbPublicModel = new PcbPublicModel();
$con = DB::connection("pcb");
foreach ($data as $k=>&$v){
//查询采购
$purchase = $PcbPurchaseModel->where("order_id",$v['order_id'])->first();
$v['tiaojia']=$v['purchase_amount'] = $v['purchase_sn'] = "";
if ($purchase){
if ( $purchase['purchase_amount'] > 0 && $purchase['purchase_amount'] != $v['order_amount']){
$v['tiaojia'] = "是";
}elseif($purchase['purchase_amount'] == 0){
$v['tiaojia'] = "";
}else{
$v['tiaojia'] = "否";
}
$v['purchase_amount'] = $purchase['purchase_amount'] > 0 ? $purchase['purchase_amount'] : "";
$v['purchase_sn'] = $purchase['purchase_sn'];
}
//查询支付
$v['order_pay_type'] = $PcbPublicModel->getPay($v['order_id']);
$v['order_type'] = PcbOrderMap::$order_type[$v['order_type']];
$v['status_name'] = PcbOrderMap::$status[$v['status']];
$v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
}
return $data;
}
//导出
public function export()
{
$data = $this->getList(2);
$column = array('ID','会员账号','交易订单编号','采购订单编号','是否调价','订单金额','调整后订单金额','订单状态','订单类型','支付方式','下单时间'); // 表头
$fileName = 'PCB交易订单列表导出'.date('YmdHis', time()).'.csv';
$temp = [];
foreach ($data as $k=>$v){
array_push($temp,[
'order_id'=>$v['order_id'],
'user_account' =>$v['user_account']."\n",
'order_sn' =>$v['order_sn']."\n",
'purchase_sn' =>@$v['purchase_sn']."\n",
'tiaojia' =>$v['tiaojia'],
'order_amount' =>$v['order_amount'],
'purchase_amount' =>$v['purchase_amount'],
'status_name' =>$v['status_name'],
'order_type' =>$v['order_type'],
'order_pay_type' =>$v['order_pay_type'],
'create_time' =>$v['create_time'],
]);
}
export_csv($temp, $column, $fileName);
}
}
\ No newline at end of file
app/Model/Pcb/PcbPublicModel.php 0 → 100644
<?php
namespace App\Model\Pcb;
use App\Map\PcbOrderMap;
use League\Flysystem\Exception;
use Request;
use DB;
class PcbPublicModel
{
/*
* 插入后台客服审核结果
*/
public function auditOrder($audit_uid,$order_id,$order_sn,$remark,$type = 1){
$con = DB::connection('pcb');
$data = [
'audit_uid'=>$audit_uid,
'order_id'=>$order_id,
'order_sn'=>$order_sn,
'type'=>$type,
'remark'=>$remark,
'create_time'=>time(),
];
$in = $con->table("order_audit_reason")->insert($data);
if ($in){
PcbActionLogModel::log(1,'order_admin_exmine',"后台审核确认订单","",$order_id,$audit_uid);
return [0,'成功'];
}else{
return [1001,'失败'];
}
}
/*
* 查询后台用户名称
*/
public function getAdminName($userId=''){
if(empty($userId)) return "";
$result=DB::table("user_info")->where('userId','=',$userId)->select('userId','name','email')->first();
if(!$result) return "";
$result=objectToArray($result);
empty($result['name']) && $result['name']=$result['email'];
return $result['name'];
}
/*
* 后台填写发货信息
*/
public function orderShipping($user_id,$data){
$datas = [
'shipping_type'=>1,
'relevance_id'=>$data['order_id'],
'relevance_sn'=>$data['order_sn'],
'shipping_no'=>$data['shipping_no'],
'shipping_name'=>$data['shipping_name'],
'shipping_id'=>$data['shipping_id'],
'status'=>1,
'update_time'=>time(),
'create_time'=>time(),
];
try{
$con = DB::connection('pcb');
$con->beginTransaction();
//插入物流信息
$shippingCon = $con->table("shipping");
$in = $shippingCon->insert($datas);
if (!$in){
throw new Exception("插入发货信息失败");
}
//修改订单发货时间和状态
$updete = (new PcbOrderModel())->where("order_id",$data['order_id'])->update(['shipping_time'=>time(),'status'=>15,'purchase_status'=>15]);
if (!$updete){
throw new Exception("更新订单发货时间、状态失败");
}
//修改采购发货时间和状态
$updete = (new PcbPurchaseModel())->where("order_id",$data['order_id'])->update(['shipping_time'=>time(),'status'=>15]);
if (!$updete){
throw new Exception("更新采购发货时间、状态失败");
}
//日志
PcbActionLogModel::log(1,'admin_add_shipping',"后台填写发货信息","",$data['order_id'],$user_id);
$con->commit();
return [0, '成功'];
}catch (\Exception $e) {
$con->rollBack();
return [10002, '失败'.$e->getMessage()];
}
}
/*
* 查询支付方式
*/
public function getPay($order_id){
$payLog = DB::connection("pcb")->table("pay_log")->where(['is_paid'=>1,'order_id'=>$order_id])->get();
$payName = "";
if ($payLog){
$payLog = objectToArray($payLog);
$payName = arrayToCommaStr($payLog,'pay_name',2);
}
return $payName;
}
}
\ No newline at end of file
app/Model/Pcb/PcbPurchaseModel.php 0 → 100644
<?php
namespace App\Model\Pcb;
use App\Map\PcbOrderMap;
use Illuminate\Database\Eloquent\Model;
use Request;
use DB;
class PcbPurchaseModel extends Model
{
protected $connection='pcb';
protected $table='purchase';
protected $primaryKey='id';
public $timestamps = false;
//列表
public function getList($type =1)
{
$arr = ['p', 'limit','self','start_time','end_time','status',"user_account","order_sn","purchase_sn","order_type","adtag","ptag"];
$input = Request::only($arr);
$input=TrimX($input,true,$arr);
// //查询数据\
$list = $this->where(function ($query) use ($input) {
foreach ($input as $k => $v){
$v = trim($v);
switch ($k){
case "p":
case "limit":
case "_url":
continue;
break;
case "start_time":
$query->where('create_time', '>=', strtotime($v));
break;
case "end_time":
$query->where('create_time', '<=',strtotime($v));
break;
default:
$query->whereIn($k, explode(',',trim($v,',')));
break;
}
}
})->orderBy('purchase_id','desc');
//getSql();
if ($type == 1){
$list = $list->paginate($input['limit'], ['*'], 'p', $input['p'])->toArray();
if (!$list) return [20001, '没有数据'];
$data = $this->clearData($list['data']);
return [0, '成功', $data, $list['total']];
}else{
return $this->clearData($list->get()->toArray());
}
}
//清洗列表数据
private function clearData($data){
if (!is_array($data) || count($data) == 0 || $data == ""){
return [];
}
foreach ($data as $k=>&$v){
//查询采购
if ($v['purchase_amount'] > 0){
$v['tiaojia'] = $v['purchase_amount'] != $v['order_amount'] ? "是" :"否"; //是否调价
}else{
$v['tiaojia'] = $v['purchase_amount'] = "";
}
$v['order_pay_type'] = PcbOrderMap::$order_pay_type[$v['order_pay_type']];
$v['order_type'] = PcbOrderMap::$order_type[$v['order_type']];
$v['status_name'] = PcbOrderMap::$status[$v['status']];
$v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
}
return $data;
}
//导出
public function export()
{
$data = $this->getList(2);
$column = array('ID','会员账号','交易订单编号','采购订单编号','是否调价','订单金额','调整后订单金额','订单状态','订单类型','支付方式','下单时间'); // 表头
$fileName = 'PCB采购列表导出'.date('YmdHis', time()).'.csv';
$temp = [];
foreach ($data as $k=>$v){
array_push($temp,[
'purchase_id'=>$v['purchase_id'],
'user_account' =>$v['user_account']."\n",
'order_sn' =>$v['order_sn']."\n",
'purchase_sn' =>@$v['purchase_sn']."\n",
'tiaojia' =>$v['tiaojia'],
'order_amount' =>$v['order_amount'],
'purchase_amount' =>$v['purchase_amount'],
'status_name' =>$v['status_name'],
'order_type' =>$v['order_type'],
'order_pay_type' =>$v['order_pay_type'],
'create_time' =>$v['create_time'],
]);
}
export_csv($temp, $column, $fileName);
}
}
\ No newline at end of file
app/Model/Pcb/PcbServerModel.php 0 → 100644
<?php
namespace App\Model\Pcb;
use Request;
use DB;
class PcbServerModel
{
public $PcbUrl ;
public function __construct()
{
$this->PcbUrl = config("website.api_domain");
}
/*
* 转采购
* @param int $admin_id 管理员id
* @param int $order_id 订单id
*/
public function AddPurchase($admin_id,$order_id){
$param = [
'admin_id'=> $admin_id ,
'order_id'=>$order_id,
];
$res = curlApi($this->PcbUrl.'/pcb/adminapi/addPurchase',$param,'POST');
return $res;
}
/*
*
* @param int $admin_id 管理员id
* @param int $order_id 订单id
* @param int $status 状态
*/
public function confirmOrder($admin_id,$purchase_id,$status){
$param = [
'purchase_id'=> $purchase_id ,
'status'=> $status ,
];
$res = curlApi($this->PcbUrl.'/pcb/adminapi/confirmOrder',$param,'POST');
$json = json_decode($res);
if ($json['err_code'] == 0){
PcbActionLogModel::log(1,'confirm_order',"采购确认","",$purchase_id,$admin_id);
}
return $res;
}
}
\ No newline at end of file
config/database.php
...@@ -83,7 +83,18 @@ return [ ...@@ -83,7 +83,18 @@ return [
'prefix' => '', 'prefix' => '',
'strict' => false, 'strict' => false,
], ],
'pcb' => [
'driver' => 'mysql',
'host' => env('DB_HOST_PCB', ''),
'database' => env('DB_DATABASE_PCB', ''),
'username' => env('DB_USERNAME_PCB', ''),
'password' => env('DB_PASSWORD_PCB', ''),
'port' => env('DB_PORT_PCB', 3306),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => 'lie_',
'strict' => false,
],
'sqlite' => [ 'sqlite' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'database' => database_path('database.sqlite'), 'database' => database_path('database.sqlite'),
......
config/params.php
<?php <?php
return [ return [
'liexin_info'=>[
'company_name'=>'猎芯科技', //收货人
'contact'=>'待定', //联系方式
'address_shipping'=>'广东深圳龙岗区万科星火online', //收货地址
'tax_type'=>'增值税专用发票', //发票类型
'tax_head'=>'深圳市猎芯科技', //发票抬头
'address_reg'=>'广东深圳龙岗区万科星火',//公司注册地址
'tax_no'=>'914403006748459155 ',//税务登记号
'phone'=>'0755-83005999',//公司电话
'bank_name'=>'中国工商银行深圳华联支行',//开户银行
'bank_account'=>'4000021609200128449',//银行卡号
],
'joint_addr' => '深圳市龙岗区坂田五和大道南2号万科星火online六栋三楼猎芯科技', // 联营自提地址 'joint_addr' => '深圳市龙岗区坂田五和大道南2号万科星火online六栋三楼猎芯科技', // 联营自提地址
'self_addr' => '深圳市光明新区新湖街道楼村社区荔都路32号A栋三楼', // 自营自提地址 'self_addr' => '深圳市光明新区新湖街道楼村社区荔都路32号A栋三楼', // 自营自提地址
......
config/website.php
...@@ -10,7 +10,7 @@ return [ ...@@ -10,7 +10,7 @@ return [
'search'=> 'http://' . env('LOGIN_DOMAIN', '') . '/api/search', 'search'=> 'http://' . env('LOGIN_DOMAIN', '') . '/api/search',
], ],
'domain' => 'liexin.net', 'domain' => 'liexin.com',
// 订单系统 // 订单系统
'order_url' => 'http://order.liexin.net', 'order_url' => 'http://order.liexin.net',
......
public/js/PcbOrderDetail.js 0 → 100644
layui.use(['table','form','element','layer', 'laydate'], function() {
var table = layui.table;
var element = layui.element;
var form = layui.form;
var laydate = layui.laydate;
})
//客服添加审核意见
function AuditOrder() {
alert_confirm("确定填写此审核结果？",function () {
$.ajax({
url:'/api/ApiAuditOrder',
type:'post',
data:{"order_id":$("#order_id").val(),'order_sn':$("#order_sn").val(),'content':$("#content").val()},
async: false,
dataType:'json',
timeout:10000,
success:function (res) {
if(res.errcode == 0){
alert_succ(res.errmsg,function () {
window.location.reload()
})
}else{
alert_err(res.errmsg)
}
}
})
})
return false;
}
//转采购
function AddPurchase() {
alert_confirm("确定填写此订单转采购？",function () {
$.ajax({
url:'/api/ApiAddPurchase',
type:'post',
data:{"order_id":$("#order_id").val()},
async: false,
dataType:'json',
timeout:10000,
success:function (res) {
if(res.err_code == 0){
alert_succ(res.err_msg,function () {
window.location.href = "/web/PcbPurchaseList"
})
}else{
alert_err(res.errmsg)
}
}
})
})
return false;
}
public/js/PcbOrderList.js 0 → 100644
layui.use(['table','form','element','layer', 'laydate'], function() {
var table = layui.table;
var element = layui.element;
var form = layui.form;
var laydate = layui.laydate;
setTimeout(function () {
table.render({
elem: '#list'
,url:'/api/ApiPcbOrderList'
,method:'post'
,cellMinWidth: 100 //全局定义常规单元格的最小宽度
,request: {
pageName: 'p' //页码的参数名称，默认：page
,limitName: 'limit' //每页数据量的参数名，默认：limit
}
,where: {start_time: $("input[name='start_time']").val(), end_time: $("input[name='end_time']").val()} //如果无需传递额外参数，可不加该参数
,loading:true
,first: true //不显示首页
,last: false //不显示尾页
,id:'Abnormal'
,cols: [[
{field:'order_id', title: 'ID',width:120,align:'center'}
,{field:'user_account', title: '会员账号',width:160,align:'center'}
,{field:'order_sn', title: '交易订单编号',width:160,align:'center'}
,{field:'purchase_sn', title: '采购订单编号',width:160,align:'center'}
,{field:'tiaojia', title: '是否调价',width:160,align:'center'}
,{field:'order_amount', title: '订单金额',width:160,align:'center'}
,{field:'purchase_amount', title: '调整后订单金额',width:160,align:'center'}
,{field:'status_name', title: '订单状态',width:160,align:'center'}
,{field:'order_type', title: '订单类型',width:160,align:'center'}
,{field:'order_pay_type', title: '支付方式',width:160,align:'center'}
,{field:'create_time', title: '下单时间',width:160,align:'center'}
,{field:'adtag', title: 'adtag',width:160,align:'center'}
,{field:'ptag', title: 'ptag',width:160,align:'center'}
,{field:'cahe', title: '操作',templet:'#cahe',width:150,align:'center', fixed: 'right'}
]]
,page:{ }
,done: function(res, curr, count) {
// 若无数据，则禁用导出按钮
if (!count) {
$('.export').addClass('layui-disabled');
} else {
$('.export').removeClass('layui-disabled');
}
}
});
},500)
form.on('submit(load)', function(data){
form.render();
var data=data.field;
//执行重载
table.reload('Abnormal', {
page: {
curr: 1
}
,where: data
});
return false;
});
form.on('checkbox(*)', function(data){
var order_type='';
var status='';
$('input:checkbox:checked').each(function(){
var obj=$(this).data('type');
if(obj=='order_type'){
order_type +=$(this).val()+',';
}
if(obj=='status'){
status +=$(this).val()+',';
}
})
$("input[name=order_type]").val(order_type);
$("input[name=status]").val(status);
});
element.on('collapse(where)', function(data){
if(data.show==true){
$(data.title).html('查询条件 (点击收起)<i class="layui-icon layui-colla-icon"></i>');
}else{
$(data.title).html('查询条件 (点击展开)<i class="layui-icon layui-colla-icon"></i>');
}
});
// 导出
$('.export').click(function(){
if ($(this).hasClass('layui-disabled')) {
return false;
}
layer.confirm('确定导出数据吗？', {
title: '导出数据'
,btn: ['确定', '取消']
}, function(){
var url = '/api/ApiPcbOrderListExport?';
var forms = $('#form1').serializeArray();
var data = {};
$.each(forms, function (i, v) {
url = url+"&"+v['name']+"="+ v['value'];
});
layer.closeAll('dialog'); // 确定时关闭弹框
window.location.href = url;
return false;
});
return false;
})
laydate.render({
elem: '#start_time',
type: 'datetime'
,format:'yyyy-MM-dd HH:mm:ss'
//,value: new Date(Date.parse(new Date()) - three_month_timestamp)
,isInitValue: false
});
laydate.render({
elem: '#end_time'
,type:'datetime'
,format:'yyyy-MM-dd HH:mm:ss'
// ,value: new Date()
,isInitValue: false
});
//发起采购
form.on('submit(SendPurchase)',(function (data) {
$("#sure_order_id").val($(this).attr("order_id"))
$("#sure_order_sn").val($(this).attr("order_sn"))
layer.open({
type: 1,
title:"请录入如下信息并确认发货给客户",
skin: 'layui-layer-rim', //加上边框
area: ['420px', '260px'], //宽高
content: $("#sendPurchase")
});
}))
//关闭订单
form.on('submit(ClosePurchase)',(function () {
var picking_id = $(this).attr('picking_id')
alert_confirm("确定关闭此采购单？",function () {
var res = ajax("/api/ApiClosePurchase",{"picking_id":picking_id,"type":1});
if(res.errcode == 5001){
alert_confirm(res.errmsg,function () {
var res1 = ajax("/api/ApiClosePurchase",{"picking_id":picking_id,"type":2});
res1.errcode > 0 ? alert_err(res1.errmsg) : alert_succ(res1.errmsg,function () {
window.location.reload();
});
})
}else if(res.errcode ==0){
alert_succ(res.errmsg)
}else{
alert_err(res.errmsg)
}
})
}))
})
//确定发货
function SendStock() {
if($("#shipping_no").val() == ""){
alert_err("请填写发货物流单号")
return false;
}
layer.msg('加载中', {
icon: 16
,shade: 0.01
});
$.ajax({
url:'/api/ApiSendStock',
type:'post',
data:{"order_id":$("#sure_order_id").val(),"order_sn":$("#sure_order_sn").val(),"shipping_no":$("#shipping_no").val(),"shipping_id":$("#shipping_id").val(),"shipping_name":$("#shipping_id").find("option:selected").text(),},
async: false,
dataType:'json',
timeout:10000,
success:function (res) {
if(res.errcode == 0){
alert_succ(res.errmsg,function () {
window.location.href='/web/PcbOrderList';
})
}else{
alert_err(res.errmsg)
}
},
done:function () {
layer.closeAll();
}
})
}
//转采购
function AddPurchase(order_id) {
alert_confirm("确定填写此订单转采购？",function () {
layer.msg('加载中', {
icon: 16
,shade: 0.01
});
$.ajax({
url:'/api/ApiAddPurchase',
type:'post',
data:{"order_id":order_id},
async: false,
dataType:'json',
timeout:10000,
success:function (res) {
if(res.err_code == 0){
alert_succ(res.err_msg,function () {
window.location.href = "/web/PcbPurchaseList"
})
}else{
alert_err(res.err_msg)
}
},
done:function () {
layer.closeAll();
}
})
})
return false;
}
public/js/PcbPurchaseList.js 0 → 100644
layui.use(['table','form','element','layer', 'laydate'], function() {
var table = layui.table;
var element = layui.element;
var form = layui.form;
var laydate = layui.laydate;
setTimeout(function () {
table.render({
elem: '#list'
,url:'/api/ApiPcbPurchaseList'
,method:'post'
,cellMinWidth: 100 //全局定义常规单元格的最小宽度
,request: {
pageName: 'p' //页码的参数名称，默认：page
,limitName: 'limit' //每页数据量的参数名，默认：limit
}
,where: {start_time: $("input[name='start_time']").val(), end_time: $("input[name='end_time']").val()} //如果无需传递额外参数，可不加该参数
,loading:true
,first: true //不显示首页
,last: false //不显示尾页
,id:'Abnormal'
,cols: [[
{field:'purchase_id', title: 'ID',width:120,align:'center'}
,{field:'user_account', title: '会员账号',width:160,align:'center'}
,{field:'order_sn', title: '交易订单编号',width:160,align:'center'}
,{field:'purchase_sn', title: '采购订单编号',width:160,align:'center'}
,{field:'tiaojia', title: '是否调价',width:160,align:'center'}
,{field:'order_amount', title: '订单金额',width:160,align:'center'}
,{field:'purchase_amount', title: '调整后订单金额',width:160,align:'center'}
,{field:'status_name', title: '订单状态',width:160,align:'center'}
,{field:'order_type', title: '订单类型',width:160,align:'center'}
,{field:'order_pay_type', title: '支付方式',width:160,align:'center'}
,{field:'create_time', title: '下单时间',width:160,align:'center'}
,{field:'cahe', title: '操作',templet:'#cahe',width:150,align:'center', fixed: 'right'}
]]
,page:{ }
,done: function(res, curr, count) {
// 若无数据，则禁用导出按钮
if (!count) {
$('.export').addClass('layui-disabled');
} else {
$('.export').removeClass('layui-disabled');
}
}
});
},500)
form.on('submit(load)', function(data){
form.render();
var data=data.field;
//执行重载
table.reload('Abnormal', {
page: {
curr: 1
}
,where: data
});
return false;
});
form.on('checkbox(*)', function(data){
var order_type='';
var status='';
$('input:checkbox:checked').each(function(){
var obj=$(this).data('type');
if(obj=='order_type'){
order_type +=$(this).val()+',';
}
if(obj=='status'){
status +=$(this).val()+',';
}
})
$("input[name=order_type]").val(order_type);
$("input[name=status]").val(status);
});
element.on('collapse(where)', function(data){
if(data.show==true){
$(data.title).html('查询条件 (点击收起)<i class="layui-icon layui-colla-icon"></i>');
}else{
$(data.title).html('查询条件 (点击展开)<i class="layui-icon layui-colla-icon"></i>');
}
});
// 导出
$('.export').click(function(){
if ($(this).hasClass('layui-disabled')) {
return false;
}
layer.confirm('确定导出数据吗？', {
title: '导出数据'
,btn: ['确定', '取消']
}, function(){
var url = '/api/ApiPcbPurchaseListExport?';
var forms = $('#form1').serializeArray();
var data = {};
$.each(forms, function (i, v) {
url = url+"&"+v['name']+"="+ v['value'];
});
layer.closeAll('dialog'); // 确定时关闭弹框
window.location.href = url;
return false;
});
return false;
})
laydate.render({
elem: '#start_time',
type: 'datetime'
,format:'yyyy-MM-dd HH:mm:ss'
//,value: new Date(Date.parse(new Date()) - three_month_timestamp)
,isInitValue: false
});
laydate.render({
elem: '#end_time'
,type:'datetime'
,format:'yyyy-MM-dd HH:mm:ss'
// ,value: new Date()
,isInitValue: false
});
})
//采购确认
function confirmOrder(purchase_id) {
layer.confirm('采购已完成，请确认是否通过审核?', {
btn: ['通过','不通过'] //按钮
}, function(){
confirmOrder2(purchase_id,1); //通过
}, function(){
confirmOrder2(purchase_id,-1); //不通过
});
}
function confirmOrder2(purchase_id,status) {
$.ajax({
url:'/api/ApiConfirmOrder',
type:'post',
data:{"purchase_id":purchase_id,'status':status},
async: false,
dataType:'json',
timeout:10000,
success:function (res) {
if(res.err_code == 0){
alert_succ(res.errmsg,function () {
window.location.reload()
})
}else{
alert_err(res.errmsg)
}
}
})
}
\ No newline at end of file
public/js/common.min.js
...@@ -124,3 +124,46 @@ function date(format, timestamp){ ...@@ -124,3 +124,46 @@ function date(format, timestamp){
return ret; return ret;
}); });
} }
//tips 提示
function alert_tip(msg,callback) {
layer.msg(msg,{icon:6});
}
//提示成功
function alert_succ(msg,callback) {
if (!callback || typeof callback == 'undefined' || callback == undefined){
layer.alert(msg,{icon:1,title:'提示信息'},function (index) {
layer.close(index);
})
}else{
layer.alert(msg,{icon:1,title:'提示信息'},function (index) {
layer.close(index);
callback();
})
}
}
//提示失败
function alert_err(msg,callback) {
if (!callback || typeof callback == 'undefined' || callback == undefined){
layer.alert(msg,{icon:2,title:'提示信息'},function (index) {
layer.close(index);
})
}else{
layer.alert(msg,{icon:2,title:'提示信息'},function (index) {
layer.close(index);
callback();
})
}
}
//确认弹框,点击确认回调函数
function alert_confirm(msg,callback){
if (!callback || typeof callback == 'undefined' || callback == undefined){
layer.confirm(msg,{icon:3,title:'提示信息'},function (index) {
layer.close(index);
})
}else{
layer.confirm(msg,{icon:3,title:'提示信息'},function (index) {
layer.close(index);
callback();
})
}
}
\ No newline at end of file
resources/views/Pcb.blade.php 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>订单管理后台 | 首页</title>
<script>document.domain="{{ Config::get('website.domain') }}";</script>
<link href="/js/layui/css/layui.css" rel="stylesheet">
@include('index.css')
<style>
label{
width: 100px !important;
}
.red{
color: red;
}
.float-r{
float: right;
}
</style>
</head>
<body class="">
<div id="wrapper">
@include('layouts.navigation')
<div id="page-wrapper" class="gray-bg">
<div class="row">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<div class="row-fluid ibox-content">
@include("Pcb.$id")
</div>
</div>
</div>
</div>
</div>
</div>
@include('index.js')
<script src="/js/layui/layui.js"></script>
<script src="/js/common.min.js"></script>
@if(empty($into))
<script src="/js/{{$id}}.js?{{time()}}"></script>
@endif
</body>
resources/views/Pcb/PcbOrderDetail.blade.php 0 → 100644
<div class="row">
<div class="wrapper">
<div class="page-content order-details">
<div class="tabs-box table-responsive">
<!--基础信息start-->
<table class="table table-bordered order-express">
<tbody>
<tr class="caption">
<th colspan="7" style="text-align: center; background: #f9f9f9;">
基础信息
</th>
</tr>
<tr>
<th>会员账号</th>
<th>交易订单编号</th>
<th>是否调价</th>
<th>订单金额</th>
<th>调整后金额</th>
<th>订单状态</th>
</tr>
<tr>
<td><?= @$orderBase['user_account'] ?></td>
<td><?= @$orderBase['order_sn'] ?></td>
<td><?= @$orderBase['tiaojia'] ?></td>
<td><?= @$orderBase['order_amount'] ?></td>
<td><?= @$purchase['purchase_amount']; ?></td>
<td><?= @$orderBase['status_name'] ?></td>
</tr>
<tr>
<th>订单类型</th>
<th>是否返单</th>
<th>公司名称</th>
<th>Adtag或其它</th>
<th>下单时间</th>
<th>支付时间</th>
</tr>
<tr>
<td><?= @$orderBase['order_type'] ?></td>
<td><?= $orderBase['is_return_order'] ? "是" : "否" ?></td>
<td><?= $orderBase['company_name'] ?></td>
<td><?= @$orderBase['adtag'] ?></td>
<td><?= @$orderBase['create_time'] ?></td>
<td><?= @$orderBase['pay_time'] ?></td>
</tr>
<tr>
<th>支付方式</th>
<th>采购订单编号</th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
<tr>
<td><?= $orderBase['order_pay_type'] ?></td>
<td><?= @$purchase['purchase_sn'] ?></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!--基础信息end-->
<!--收货信息start-->
<table class="table table-bordered">
<tbody>
<tr class="caption">
<th colspan="7" style="text-align: center; background: #f9f9f9;">
收货信息
</th>
</tr>
<tr>
<th>收货人</th>
<th>联系方式</th>
<th>收货地址</th>
<th>配送快递</th>
<th>快递单号</th>
</tr>
<tr>
<td><?= $orderAddress['consignee'] ?></td>
<td><?= $orderAddress['mobile'] ?></td>
<td><?= $orderAddress["province"].$orderAddress["city"].$orderAddress["district"].$orderAddress['detail_address'] ?></td>
<td><?= @$shipping['shipping_name'] ?></td>
<td><?= @$shipping['shipping_no'] ?></td>
</tr>
</tbody>
</table>
<!--收货信息end-->
<!--技术联系人信息start-->
<table class="table table-bordered order-express">
<tbody>
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
技术联系人信息
</th>
</tr>
<tr>
<td colspan="3">
<table class="table table-bordered">
<tbody>
<tr>
<th>技术联系人</th>
<th>联系方式</th>
</tr>
<tr>
<td><?= @$orderInfo['technical_contact'] ?></td>
<td><?= @$orderInfo['technical_contact_tel'] ?></td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!--技术联系人信息end-->
<!--发票信息start-->
<table class="table table-bordered order-express">
<tbody>
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
发票信息
</th>
</tr>
<tr>
<td colspan="3">
<table class="table table-bordered">
<tbody>
<tr>
<th>发票类型</th>
<th>发票抬头</th>
<th>公司注册地址</th>
<th>税务登记号</th>
</tr>
<tr>
<td><?= @$orderInvoice['inv_type'] ?></td>
<td><?= @$orderInvoice['tax_title'] ?></td>
<td><?= @$orderInvoice["province"].@$orderInvoice["city"].@$orderInvoice["district"].@$orderInvoice['consignee_address'] ?></td>
<td><?= @$orderInvoice['tax_no'] ?></td>
</tr>
<tr>
<th>公司电话</th>
<th>开户银行</th>
<th>银行卡号</th>
<th></th>
</tr>
<tr>
<td><?= @$orderInvoice['company_phone'] ?></td>
<td><?= @$orderInvoice['bank_name'] ?></td>
<td><?= @$orderInvoice['bank_account'] ?></td>
<td></td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!--发票信息end-->
<!--PCB信息start-->
<table class="table table-bordered order-express">
<tbody>
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
PCB信息
</th>
</tr>
<tr>
<td colspan="3">
<table class="table table-bordered">
<tbody>
<tr>
<th>板子长宽</th>
<th>板子数量</th>
<th>板子面积</th>
<th>板子层数</th>
<th>拼板个数</th>
<th>阻焊颜色</th>
</tr>
<tr>
<td><?= $orderInfo['length']."cm*".$orderInfo['width'].'cm' ?></td>
<td><?= $orderInfo['qty'] ?></td>
<td><?= $orderInfo['length']*$orderInfo['width']."平方厘米" ?></td>
<td><?= $orderInfo['layer'] ?></td>
<td><?= $orderInfo['design_num'] ?></td>
<td><?= $orderInfo['board_color'] ?></td>
</tr>
<tr>
<th>板子厚度</th>
<th>最小线宽/线距</th>
<th>过孔</th>
<th>字符颜色</th>
<th>铜箔厚度</th>
<th>测试类型</th>
</tr>
<tr>
<td><?= $orderInfo['thickness'] ?></td>
<td><?= $orderInfo['line_space'] ?></td>
<td><?= $orderInfo['min_hole_size'] ?></td>
<td><?= $orderInfo['font_color'] ?></td>
<td><?= $orderInfo['copper_thickness'] ?></td>
<td><?= $orderInfo['test_type'] ?></td>
</tr>
<tr>
<th>焊盘喷镀</th>
<th>阻焊覆盖</th>
<th>内层铜厚</th>
<th>生产周期</th>
<th>交货日期</th>
<th></th>
</tr>
<tr>
<td><?= @$orderInfo['surface'] ?></td>
<td><?= $orderInfo['via_process'] ?></td>
<td><?= $orderInfo['copper_thickness'] ?></td>
<td><?= @$orderAuditDetail['text'] ?></td>
<td><?= $purchase['finish_time'] ?></td>
<td></td>
</tr>
<tr>
<th>其他要求</th>
<th colspan="5"><?= $orderBase['order_remark'] ?></th>
</tr>
<tr>
<th>特殊工艺</th>
<th colspan="5"><?= $orderInfo['teshu'] ?></th>
</tr>
<tr>
<th>供应商审核结果</th>
<th colspan="5"><?= @$orderAuditReason2['remark'] ?></th>
</tr>
<tr>
<th>确认后审核结果</th>
<th colspan="5"><input style="width: 300px;" value="<?= @$orderAuditReason1['remark'] ?>" type="text" id="content" name="">&nbsp;&nbsp;<button class="layui-btn layui-btn-xs" onclick="AuditOrder()" >提交</button></th>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!--PCB信息end-->
<!--费用信息start-->
<table class="table table-bordered order-express">
<tbody>
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
费用信息
</th>
</tr>
<tr>
<td colspan="3">
<table class="table table-bordered">
<tbody>
<tr>
<th>工程费</th>
<th>拼版费</th>
<th>版费</th>
<th>菲林费</th>
<th>喷镀费</th>
<th>颜色费</th>
</tr>
<tr>
<td><?= $orderAuditDetail['pcb_gcf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_pinban_net'] ?></td>
<td><?= $orderAuditDetail['pcb_bf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_flf_net'] ?></td>
<td><?= $orderAuditDetail['pdf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_ysf_net'] ?></td>
</tr>
<tr>
<th>测试费</th>
<th>加急费</th>
<th>税费</th>
<th>快递费</th>
<th>其他费用</th>
<th></th>
</tr>
<tr>
<td><?= $orderAuditDetail['pcb_ccf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_jjf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_sf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_kdf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_other_net'] ?></td>
<td></td>
</tr>
<tr>
<th>总计</th>
<th colspan="2"><?= $orderBase['order_amount'] ?></th>
<th>获得积分</th>
<th colspan="2"><?= $orderBase['integral'] ?></th>
</tr>
<tr>
<th>其他费用说明</th>
<th colspan="5"></th>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!--费用信息end-->
<?Php if(!count($purchase) && $orderBase['status'] == 1) { ?>
<div style="margin-top: 10px;margin-bottom: 20px;">
<div style="">
<button class="layui-btn export" onclick="AddPurchase()">发起采购</button>
</div>
</div>
<?php } ?>
</div>
<div class="tabs-box table-responsive">
<table class="table table-bordered table-hover">
<thead>
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
操作记录
</th>
</tr>
<tr>
<th>操作时间</th>
<th>操作人</th>
<th>操作事件</th>
</tr>
</thead>
<tbody>
<?php foreach ($actionLog as $k=>$v) { ?>
<tr>
<td width="15%"><?= date('Y-m-d H:i:s',$v['create_time']) ?></td>
<td width="10%"><?= $v['user_name'] ?></td>
<td><?= $v['content'] ?></td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--隐藏域-->
<input type="hidden" value="<?= $orderBase['order_sn'] ?>" id="order_sn">
<input type="hidden" value="<?= $orderBase['order_id'] ?>" id="order_id">
\ No newline at end of file
resources/views/Pcb/PcbOrderList.blade.php 0 → 100644
<form class="layui-form" id="form1">
<div class="layui-collapse layui-box" lay-filter="where">
<div class="layui-colla-item">
<h2 class="layui-colla-title" style="margin: 0">查询条件 (点击收起)</h2>
<div class="layui-colla-content layui-show">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">下单时间:</label>
<div class="layui-input-inline" style="width: 200px;">
<input type="text" name="start_time" id="start_time" placeholder="开始时间" autocomplete="off" class="layui-input">
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline" style="width: 200px;">
<input type="text" name="end_time" id="end_time" placeholder="结束时间" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">会员账号:</label>
<div class="layui-input-inline">
<input type="text" name="user_account" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">交易订单编号:</label>
<div class="layui-input-inline">
<input type="text" name="order_sn" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">采购订单编号:</label>
<div class="layui-input-inline">
<input type="text" name="purchase_sn" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单状态:</label>
<div class="layui-input-inline">
<div class="layui-input-inline payment-status" style="width: 800px !important;">
<input type="hidden" name="status" value="">
@if(!empty($status) && is_array($status))
@foreach($status as $k=>$v)
<input type="checkbox" lay-filter="*" data-type="status" value="{{$k}}" title="{{$v or '未知'}}" >
@endforeach
@endif
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">订单类型:</label>
<div class="layui-input-inline payment-status">
<input type="hidden" name="order_type" value="">
@if(!empty($order_type) && is_array($order_type))
@foreach($order_type as $k=>$v)
<input type="checkbox" lay-filter="*" data-type="status" value="{{$k}}" title="{{$v or '未知'}}" >
@endforeach
@endif
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">adtag:</label>
<div class="layui-input-inline">
<input type="text" name="adtag" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">ptag:</label>
<div class="layui-input-inline">
<input type="text" name="ptag" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
</div>
</div>
</div>
<div style="margin-top: 10px">
<div style="float: left;">
<button class="layui-btn" lay-submit="" lay-filter="load">立即查询</button>
<button type="reset" class="layui-btn layui-btn-primary">重置条件</button>
<button class="layui-btn export" >导出</button>
</div>
</div>
</form>
<table class="layui-table" lay-filter="test" id="list"></table>
<script type="text/html" id="cahe">
<a href="/web/PcbOrderDetail?order_id=@{{ d.order_id }}" class="btn btn-xs btn-outline btn-success"><strong>详情</strong></a>
@{{# if(d.status==1){ }}
<button class="btn btn-xs btn-outline btn-danger" lay-submit="" order_id="@{{ d.order_id }}" order_sn="@{{ d.order_sn }}" onclick="AddPurchase(@{{ d.order_id }})">发起采购</button>
@{{# } }}
@{{# if(d.status==14 && d.shipping_time == 0){ }}
<button class="btn btn-xs btn-outline btn-danger" lay-submit="" order_id="@{{ d.order_id }}" order_sn="@{{ d.order_sn }}" lay-filter="SendPurchase">发货</button>
@{{# } }}
</script>
<!--弹出层-->
<div id="sendPurchase" style="display: none">
<br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;配送快递:&nbsp;&nbsp;
<select type='text' style='width: 200px;height: 30px;' id="shipping_id">
<?php foreach($shipping as $k=>$v){ ?>
<option value="<?= $v['shipping_id']; ?>"><?= $v['shipping_name']; ?></option>
<?php } ?>
</select><br/><br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;快递单号:&nbsp;&nbsp;<input type='text' id="shipping_no" style='width: 200px;height: 30px;' ><br/><br/>
<input type='hidden' id='sure_order_id'> <input type='hidden' id='sure_order_sn'>
&nbsp;&nbsp;&nbsp;&nbsp;<button class='layui-btn' onclick='SendStock()' style="margin-left: 130px;">确定发货</button>
</div>
resources/views/Pcb/PcbPurchaseDetail.blade.php 0 → 100644
<div class="row">
<div class="wrapper">
<div class="page-content order-details">
<div class="tabs-box table-responsive">
<!--基础信息start-->
<table class="table table-bordered order-express">
<tbody>
<tr class="caption">
<th colspan="7" style="text-align: center; background: #f9f9f9;">
基础信息
</th>
</tr>
<tr>
<th>采购订单编号</th>
<th>交易订单编号</th>
<th>是否调价</th>
<th>调整前订单金额</th>
<th>调整后金额</th>
<th>订单状态</th>
</tr>
<tr>
<td><?= @$purchase['purchase_sn'] ?></td>
<td><?= @$orderBase['order_sn'] ?></td>
<td><?= @$orderBase['tiaojia'] ?></td>
<td><?= @$orderBase['order_amount'] ?></td>
<td><?= @$purchase['purchase_amount']; ?></td>
<td><?= @$orderBase['status_name'] ?></td>
</tr>
<tr>
<th>订单类型</th>
<th>下单时间</th>
<th>支付时间</th>
<th>支付方式</th>
<th></th>
<th></th>
</tr>
<tr>
<td><?= @$orderBase['order_type'] ?></td>
<td><?= @$orderBase['create_time'] ?></td>
<td><?= @$orderBase['pay_time'] ?></td>
<td><?= @$purchase['order_pay_type'] ?></td>
<td></td>
</tr>
</tbody>
</table>
<!--基础信息end-->
<!--收货信息start-->
<table class="table table-bordered">
<tbody>
<tr class="caption">
<th colspan="7" style="text-align: center; background: #f9f9f9;">
收货信息
</th>
</tr>
<tr>
<th>收货人</th>
<th>联系方式</th>
<th>收货地址</th>
<th>配送快递</th>
<th>快递单号</th>
</tr>
<tr>
<td><?= $liexinInfo['company_name'] ?></td>
<td><?= $liexinInfo['contact'] ?></td>
<td><?= $liexinInfo['address_shipping'] ?></td>
<td><?= @$shipping['shipping_name'] ?></td>
<td><?= @$shipping['shipping_no'] ?></td>
</tr>
</tbody>
</table>
<!--收货信息end-->
<!--发票信息start-->
<table class="table table-bordered order-express">
<tbody>
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
发票信息
</th>
</tr>
<tr>
<td colspan="3">
<table class="table table-bordered">
<tbody>
<tr>
<th>发票类型</th>
<th>发票抬头</th>
<th>公司注册地址</th>
<th>税务登记号</th>
</tr>
<tr>
<td><?= @$liexinInfo['tax_type'] ?></td>
<td><?= @$liexinInfo['tax_head'] ?></td>
<td><?= $liexinInfo['address_reg'] ?></td>
<td><?= @$liexinInfo['tax_no'] ?></td>
</tr>
<tr>
<th>公司电话</th>
<th>开户银行</th>
<th>银行卡号</th>
<th></th>
</tr>
<tr>
<td><?= @$liexinInfo['phone'] ?></td>
<td><?= @$liexinInfo['bank_name'] ?></td>
<td><?= @$liexinInfo['bank_account'] ?></td>
<td></td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!--发票信息end-->
<!--PCB信息start-->
<table class="table table-bordered order-express">
<tbody>
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
PCB信息
</th>
</tr>
<tr>
<td colspan="3">
<table class="table table-bordered">
<tbody>
<tr>
<th>板子长宽</th>
<th>板子数量</th>
<th>板子面积</th>
<th>板子层数</th>
<th>拼板个数</th>
<th>阻焊颜色</th>
</tr>
<tr>
<td><?= $orderInfo['length']."cm*".$orderInfo['width'].'cm' ?></td>
<td><?= $orderInfo['qty'] ?></td>
<td><?= $orderInfo['length']*$orderInfo['width']."平方厘米" ?></td>
<td><?= $orderInfo['layer'] ?></td>
<td><?= $orderInfo['design_num'] ?></td>
<td><?= $orderInfo['board_color'] ?></td>
</tr>
<tr>
<th>板子厚度</th>
<th>最小线宽/线距</th>
<th>过孔</th>
<th>字符颜色</th>
<th>铜箔厚度</th>
<th>飞针测试</th>
</tr>
<tr>
<td><?= $orderInfo['thickness'] ?></td>
<td><?= $orderInfo['line_space'] ?></td>
<td><?= $orderInfo['via_process'] ?></td>
<td><?= $orderInfo['font_color'] ?></td>
<td><?= $orderInfo['copper_thickness'] ?></td>
<td><?= $orderInfo['test_type'] ?></td>
</tr>
<tr>
<th>焊盘喷镀</th>
<th>阻焊覆盖</th>
<th>内层铜厚</th>
<th>生产周期</th>
<th>交货日期</th>
<th></th>
</tr>
<tr>
<td><?= @$orderInfo['surface'] ?></td>
<td><?= $orderInfo['via_process'] ?></td>
<td><?= $orderInfo['copper_thickness'] ?></td>
<td><?= @$orderAuditDetail['text'] ?></td>
<td><?= $purchase['finish_time'] ?></td>
<td></td>
</tr>
<tr>
<th>其他要求</th>
<th colspan="5"><?= $orderBase['order_remark'] ?></th>
</tr>
<tr>
<th>特殊工艺</th>
<th colspan="5"><?= $orderInfo['teshu'] ?></th>
</tr>
<tr>
<th>供应商审核结果</th>
<th colspan="5"><?= @$orderAuditReason2['remark'] ?></th>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!--PCB信息end-->
<!--费用信息start-->
<table class="table table-bordered order-express">
<tbody>
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
费用信息
</th>
</tr>
<tr>
<td colspan="3">
<table class="table table-bordered">
<tbody>
<tr>
<th>工程费</th>
<th>拼版费</th>
<th>版费</th>
<th>菲林费</th>
<th>喷镀费</th>
<th>颜色费</th>
</tr>
<tr>
<td><?= $orderAuditDetail['pcb_gcf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_pinban_net'] ?></td>
<td><?= $orderAuditDetail['pcb_bf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_flf_net'] ?></td>
<td><?= $orderAuditDetail['pdf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_ysf_net'] ?></td>
</tr>
<tr>
<th>测试费</th>
<th>加急费</th>
<th>税费</th>
<th>快递费</th>
<th>其他费用</th>
<th></th>
</tr>
<tr>
<td><?= $orderAuditDetail['pcb_ccf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_jjf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_sf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_kdf_net'] ?></td>
<td><?= $orderAuditDetail['pcb_other_net'] ?></td>
<td></td>
</tr>
<tr>
<th>总计</th>
<th colspan="2"><?= $orderBase['order_amount'] ?></th>
<th>获得积分</th>
<th colspan="2"><?= $orderBase['integral'] ?></th>
</tr>
<tr>
<th>其他费用说明</th>
<th colspan="5"></th>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!--费用信息end-->
{{--<div style="margin-top: 10px;margin-bottom: 20px;">--}}
{{--<div style="">--}}
{{--<button class="layui-btn export" onclick="AddPurchase()">发起采购</button>--}}
{{--</div>--}}
{{--</div>--}}
</div>
<div class="tabs-box table-responsive">
<table class="table table-bordered table-hover">
<thead>
<tr class="caption">
<th colspan="3" style="text-align: center; background: #f9f9f9;">
操作记录
</th>
</tr>
<tr>
<th>操作时间</th>
<th>操作人</th>
<th>操作事件</th>
</tr>
</thead>
<tbody>
<?php foreach ($actionLog as $k=>$v) { ?>
<tr>
<td width="15%"><?= date('Y-m-d H:i:s',$v['create_time']) ?></td>
<td width="10%"><?= $v['user_name'] ?></td>
<td><?= $v['content'] ?></td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--隐藏域-->
<input type="hidden" value="<?= $orderBase['order_sn'] ?>" id="order_sn">
<input type="hidden" value="<?= $orderBase['order_id'] ?>" id="order_id">
\ No newline at end of file
resources/views/Pcb/PcbPurchaseList.blade.php 0 → 100644
<form class="layui-form" id="form1">
<div class="layui-collapse layui-box" lay-filter="where">
<div class="layui-colla-item">
<h2 class="layui-colla-title" style="margin: 0">查询条件 (点击收起)</h2>
<div class="layui-colla-content layui-show">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">下单时间:</label>
<div class="layui-input-inline" style="width: 200px;">
<input type="text" name="start_time" id="start_time" placeholder="开始时间" autocomplete="off" class="layui-input">
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline" style="width: 200px;">
<input type="text" name="end_time" id="end_time" placeholder="结束时间" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">会员账号:</label>
<div class="layui-input-inline">
<input type="text" name="user_account" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">交易订单编号:</label>
<div class="layui-input-inline">
<input type="text" name="order_sn" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">采购订单编号:</label>
<div class="layui-input-inline">
<input type="text" name="purchase_sn" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">订单状态:</label>
<div class="layui-input-inline payment-status" style="width: 800px !important;">
<input type="hidden" name="status" value="">
@if(!empty($status) && is_array($status))
@foreach($status as $k=>$v)
<input type="checkbox" lay-filter="*" data-type="status" value="{{$k}}" title="{{$v or '未知'}}" >
@endforeach
@endif
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">订单类型:</label>
<div class="layui-input-inline payment-status">
<input type="hidden" name="order_type" value="">
@if(!empty($order_type) && is_array($order_type))
@foreach($order_type as $k=>$v)
<input type="checkbox" lay-filter="*" data-type="status" value="{{$k}}" title="{{$v or '未知'}}" >
@endforeach
@endif
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">adtag:</label>
<div class="layui-input-inline">
<input type="text" name="adtag" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">ptag:</label>
<div class="layui-input-inline">
<input type="text" name="ptag" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
</div>
</div>
</div>
<div style="margin-top: 10px">
<div style="float: left;">
<button class="layui-btn" lay-submit="" lay-filter="load">立即查询</button>
<button type="reset" class="layui-btn layui-btn-primary">重置条件</button>
<button class="layui-btn export" >导出</button>
</div>
</div>
</form>
<table class="layui-table" lay-filter="test" id="list"></table>
<script type="text/html" id="cahe">
<a href="/web/PcbPurchaseDetail?purchase_id=@{{ d.purchase_id }}&order_id=@{{ d.order_id }}" class="btn btn-xs btn-outline btn-success"><strong>详情</strong></a>
@{{# if(d.status==3){ }}
<button class="btn btn-xs btn-outline btn-danger" lay-submit="" order_id="@{{ d.purchase_id }}" order_sn="@{{ d.purchase_sn }}" onclick="confirmOrder(@{{ d.purchase_id }})">采购确认</button>
@{{# } }}
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment