今天代码完成，

.idea/workspace.xml

@@ -2,10 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="11c83ff8-0ec9-44da-868f-563af5d42189" name="Default" comment="今天代码完成，修改">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/meib/meib/static/js/bootstrap-select_new.js" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/meib/meib/templates/zz.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/logs/hwj.log" afterPath="$PROJECT_DIR$/meib/logs/hwj.log" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/apps/erp/views.py" afterPath="$PROJECT_DIR$/meib/meib/apps/erp/views.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/templates/dep_ps.html" afterPath="$PROJECT_DIR$/meib/meib/templates/dep_ps.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/static/js/bootstrap-select_new.js" afterPath="$PROJECT_DIR$/meib/meib/static/js/bootstrap-select_new.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/templates/order.html" afterPath="$PROJECT_DIR$/meib/meib/templates/order.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -19,7 +20,7 @@
     <SUITE FILE_PATH="coverage/meibang$views.coverage" NAME="views Coverage Results" MODIFIED="1582180589736" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/meib/meib/apps/erp" />
     <SUITE FILE_PATH="coverage/meibang$lianxi.coverage" NAME="lianxi Coverage Results" MODIFIED="1582180848155" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/meib/meib/apps/erp" />
     <SUITE FILE_PATH="coverage/meibang$date_time.coverage" NAME="date_time Coverage Results" MODIFIED="1578910060603" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/meib/meib/utils" />
-    <SUITE FILE_PATH="coverage/meibang$manage.coverage" NAME="manage Coverage Results" MODIFIED="1582634357377" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/meib" />
+    <SUITE FILE_PATH="coverage/meibang$manage.coverage" NAME="manage Coverage Results" MODIFIED="1582697551601" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/meib" />
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FavoritesManager">
@@ -30,8 +31,8 @@
       <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/meib/meib/apps/erp/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="13" column="17" lean-forward="false" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="17" />
+            <state relative-caret-position="162">
+              <caret line="7" column="65" lean-forward="true" selection-start-line="7" selection-start-column="65" selection-end-line="7" selection-end-column="65" />
               <folding />
             </state>
           </provider>
@@ -40,8 +41,8 @@
       <file leaf-file-name="views.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/meib/meib/apps/erp/views.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="388">
-              <caret line="1713" column="30" lean-forward="false" selection-start-line="1713" selection-start-column="30" selection-end-line="1713" selection-end-column="30" />
+            <state relative-caret-position="405">
+              <caret line="1721" column="48" lean-forward="true" selection-start-line="1721" selection-start-column="48" selection-end-line="1721" selection-end-column="48" />
               <folding>
                 <element signature="e#589#25007#0" expanded="false" />
                 <element signature="e#655#689#0" expanded="false" />
@@ -76,105 +77,107 @@
                 <element signature="e#77364#79344#0" expanded="false" />
                 <element signature="e#77397#79344#0" expanded="false" />
                 <element signature="e#79416#79452#0" expanded="false" />
-                <element signature="e#82910#82991#0" expanded="false" />
-                <element signature="e#83104#83584#0" expanded="false" />
-                <element signature="e#83648#83879#0" expanded="false" />
-                <element signature="e#83943#84206#0" expanded="false" />
-                <element signature="e#84279#84581#0" expanded="false" />
-                <element signature="e#84641#84676#0" expanded="false" />
-                <marker date="1582644401416" expanded="true" signature="4555:4615" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1582644401416" expanded="true" signature="4917:4979" ph="SELECT ISNUL... " />
-                <marker date="1582644401416" expanded="true" signature="5844:6074" ph="INSERT INTO MF_PSS... " />
-                <marker date="1582644401416" expanded="true" signature="7052:7105" ph="INSERT INTO MF_PSS_Z... " />
-                <marker date="1582644401416" expanded="true" signature="7242:7474" ph="INSERT INTO MF_ARP... " />
-                <marker date="1582644401416" expanded="true" signature="8401:8633" ph="INSERT INTO MF_PSS... " />
-                <marker date="1582644401416" expanded="true" signature="9575:9780" ph="INSERT INTO TF_PSS... " />
-                <marker date="1582644401416" expanded="true" signature="14798:14855" ph="SELECT ZHANG... MF_PSS" />
-                <marker date="1582644401416" expanded="true" signature="15026:15095" ph="SELECT ISNUL... MF_ARP" />
-                <marker date="1582644401416" expanded="true" signature="15364:15433" ph="SELECT ISNUL... MF_PSS" />
-                <marker date="1582644401416" expanded="true" signature="15835:15895" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1582644401416" expanded="true" signature="16197:16259" ph="SELECT ISNUL... " />
-                <marker date="1582644401416" expanded="true" signature="17169:17226" ph="UPDATE MF_PS... " />
-                <marker date="1582644401416" expanded="true" signature="17324:17381" ph="UPDATE MF_PS... " />
-                <marker date="1582644401416" expanded="true" signature="17516:17654" ph="UPDATE MF_PS... " />
-                <marker date="1582644401416" expanded="true" signature="18489:18607" ph="UPDATE MF_AR... " />
-                <marker date="1582644401416" expanded="true" signature="19232:19459" ph="INSERT INTO MF_ARP... " />
-                <marker date="1582644401416" expanded="true" signature="20476:20614" ph="UPDATE MF_PS... " />
-                <marker date="1582644401416" expanded="true" signature="21222:21272" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="21461:21572" ph="UPDATE TF_PS... " />
-                <marker date="1582644401416" expanded="true" signature="23238:23295" ph="SELECT ZHANG... MF_PSS" />
-                <marker date="1582644401416" expanded="true" signature="23515:23584" ph="SELECT ISNUL... MF_ARP" />
-                <marker date="1582644401416" expanded="true" signature="23899:23968" ph="SELECT ISNUL... MF_PSS" />
-                <marker date="1582644401416" expanded="true" signature="24368:24417" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="24477:24526" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="24586:24637" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="29586:29646" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1582644401416" expanded="true" signature="29948:30010" ph="SELECT ISNUL... " />
-                <marker date="1582644401416" expanded="true" signature="30901:31154" ph="INSERT INTO MF_PSS... " />
-                <marker date="1582644401416" expanded="true" signature="32285:32521" ph="INSERT INTO MF_ARP... " />
-                <marker date="1582644401416" expanded="true" signature="33449:33704" ph="INSERT INTO MF_PSS... " />
-                <marker date="1582644401416" expanded="true" signature="34765:34974" ph="INSERT INTO TF_PSS... " />
-                <marker date="1582644401416" expanded="true" signature="39417:39474" ph="SELECT ZHANG... MF_PSS" />
-                <marker date="1582644401416" expanded="true" signature="39735:39804" ph="SELECT ISNUL... MF_ARP" />
-                <marker date="1582644401416" expanded="true" signature="40119:40188" ph="SELECT ISNUL... MF_PSS" />
-                <marker date="1582644401416" expanded="true" signature="40640:40700" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1582644401416" expanded="true" signature="41002:41064" ph="SELECT ISNUL... " />
-                <marker date="1582644401416" expanded="true" signature="42009:42147" ph="UPDATE MF_PS... " />
-                <marker date="1582644401416" expanded="true" signature="42862:42980" ph="UPDATE MF_AR... " />
-                <marker date="1582644401416" expanded="true" signature="43542:43773" ph="INSERT INTO MF_ARP... " />
-                <marker date="1582644401416" expanded="true" signature="44790:44928" ph="UPDATE MF_PS... " />
-                <marker date="1582644401416" expanded="true" signature="45536:45586" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="45796:45907" ph="UPDATE TF_PS... " />
-                <marker date="1582644401416" expanded="true" signature="47362:47419" ph="SELECT ZHANG... MF_PSS" />
-                <marker date="1582644401416" expanded="true" signature="47639:47708" ph="SELECT ISNUL... MF_ARP" />
-                <marker date="1582644401416" expanded="true" signature="48023:48092" ph="SELECT ISNUL... MF_PSS" />
-                <marker date="1582644401416" expanded="true" signature="48492:48541" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="48601:48650" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="48710:48761" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="53073:53133" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1582644401416" expanded="true" signature="53449:53500" ph="SELECT ISNUL... BACC" />
-                <marker date="1582644401416" expanded="true" signature="53955:54249" ph="INSERT INTO TF_MON... " />
-                <marker date="1582644401416" expanded="true" signature="55753:56033" ph="INSERT INTO TF_MON... " />
-                <marker date="1582644401416" expanded="true" signature="56445:56580" ph="INSERT INTO MF_MON... " />
-                <marker date="1582644401416" expanded="true" signature="57009:57232" ph="INSERT INTO MF_BAC... " />
-                <marker date="1582644401416" expanded="true" signature="58087:58241" ph="INSERT INTO TF_BAC... " />
-                <marker date="1582644401416" expanded="true" signature="62910:62970" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1582644401416" expanded="true" signature="63311:63362" ph="SELECT ISNUL... BACC" />
-                <marker date="1582644401416" expanded="true" signature="63838:63991" ph="UPDATE TF_MO... " />
-                <marker date="1582644401416" expanded="true" signature="64360:64514" ph="UPDATE TF_MO... " />
-                <marker date="1582644401416" expanded="true" signature="64779:64828" ph="UPDATE MF_MO... " />
-                <marker date="1582644401416" expanded="true" signature="65016:65103" ph="UPDATE MF_BA... " />
-                <marker date="1582644401416" expanded="true" signature="65380:65439" ph="UPDATE TF_BA... " />
-                <marker date="1582644401416" expanded="true" signature="66993:67040" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="67114:67162" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="67238:67271" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="67359:67392" ph="DELETE FROM " />
-                <marker date="1582644401416" expanded="true" signature="67912:67991" ph="SELECT table... TABLES" />
-                <marker date="1582644401416" expanded="true" signature="68183:68214" ph="SELECT COUNT... MF_LZ1_Z01" />
-                <marker date="1582644401416" expanded="true" signature="68396:68951" ph="SELECT ISNUL... MF_LZ1_Z01" />
-                <marker date="1582644401416" expanded="true" signature="69761:69806" ph="UPDATE MF_LZ... " />
-                <marker date="1582644401416" expanded="true" signature="70140:70218" ph="SELECT table... TABLES" />
-                <marker date="1582644401416" expanded="true" signature="70410:70440" ph="SELECT COUNT... MF_LZ_Z01" />
-                <marker date="1582644401416" expanded="true" signature="70627:71180" ph="SELECT ISNUL... MF_LZ_Z01" />
-                <marker date="1582644401416" expanded="true" signature="72013:72057" ph="UPDATE MF_LZ... " />
-                <marker date="1582644401416" expanded="true" signature="72785:72863" ph="SELECT table... TABLES" />
-                <marker date="1582644401416" expanded="true" signature="73054:73084" ph="SELECT COUNT... TC_MON_PC" />
-                <marker date="1582644401416" expanded="true" signature="73271:73752" ph="SELECT ISNUL... TC_MON_PC" />
-                <marker date="1582644401416" expanded="true" signature="74339:74383" ph="UPDATE TC_MO... " />
-                <marker date="1582644401416" expanded="true" signature="75148:75226" ph="SELECT table... TABLES" />
-                <marker date="1582644401416" expanded="true" signature="75417:75447" ph="SELECT COUNT... TC_MON_PC" />
-                <marker date="1582644401416" expanded="true" signature="75634:76079" ph="SELECT ISNUL... TC_MON_PC" />
-                <marker date="1582644401416" expanded="true" signature="76686:76730" ph="UPDATE TC_MO... " />
-                <marker date="1582644401416" expanded="true" signature="77494:77572" ph="SELECT table... TABLES" />
-                <marker date="1582644401416" expanded="true" signature="77763:77793" ph="SELECT COUNT... TC_MON_PC" />
-                <marker date="1582644401416" expanded="true" signature="77980:78497" ph="SELECT ISNUL... TC_MON_PC" />
-                <marker date="1582644401416" expanded="true" signature="79104:79148" ph="UPDATE TC_MO... " />
-                <marker date="1582644401416" expanded="false" signature="79988:80778" ph="SELECT top 5... " />
-                <marker date="1582644401416" expanded="true" signature="82497:82567" ph="UPDATE TF_PO... " />
-                <marker date="1582644401416" expanded="true" signature="82497:82578" ph="UPDATE TF_PO... " />
-                <marker date="1582644401416" expanded="true" signature="83133:83158" ph="SELECT DEP,N... DEPT" />
-                <marker date="1582644401416" expanded="true" signature="83656:83685" ph="SELECT TOP 5... MF_MO" />
-                <marker date="1582644401416" expanded="true" signature="83951:84013" ph="SELECT * FRO... CUST" />
+                <element signature="e#85050#85131#0" expanded="false" />
+                <element signature="e#85244#85724#0" expanded="false" />
+                <element signature="e#85788#86019#0" expanded="false" />
+                <element signature="e#86083#86346#0" expanded="false" />
+                <element signature="e#86419#86721#0" expanded="false" />
+                <element signature="e#86781#86816#0" expanded="false" />
+                <marker date="1582697933271" expanded="true" signature="4555:4615" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1582697933271" expanded="true" signature="4917:4979" ph="SELECT ISNUL... " />
+                <marker date="1582697933271" expanded="true" signature="5844:6074" ph="INSERT INTO MF_PSS... " />
+                <marker date="1582697933271" expanded="true" signature="7052:7105" ph="INSERT INTO MF_PSS_Z... " />
+                <marker date="1582697933271" expanded="true" signature="7242:7474" ph="INSERT INTO MF_ARP... " />
+                <marker date="1582697933271" expanded="true" signature="8401:8633" ph="INSERT INTO MF_PSS... " />
+                <marker date="1582697933271" expanded="true" signature="9575:9780" ph="INSERT INTO TF_PSS... " />
+                <marker date="1582697933271" expanded="true" signature="14798:14855" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1582697933271" expanded="true" signature="15026:15095" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1582697933271" expanded="true" signature="15364:15433" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1582697933271" expanded="true" signature="15835:15895" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1582697933271" expanded="true" signature="16197:16259" ph="SELECT ISNUL... " />
+                <marker date="1582697933271" expanded="true" signature="17169:17226" ph="UPDATE MF_PS... " />
+                <marker date="1582697933271" expanded="true" signature="17324:17381" ph="UPDATE MF_PS... " />
+                <marker date="1582697933271" expanded="true" signature="17516:17654" ph="UPDATE MF_PS... " />
+                <marker date="1582697933271" expanded="true" signature="18489:18607" ph="UPDATE MF_AR... " />
+                <marker date="1582697933271" expanded="true" signature="19232:19459" ph="INSERT INTO MF_ARP... " />
+                <marker date="1582697933271" expanded="true" signature="20476:20614" ph="UPDATE MF_PS... " />
+                <marker date="1582697933271" expanded="true" signature="21222:21272" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="21461:21572" ph="UPDATE TF_PS... " />
+                <marker date="1582697933271" expanded="true" signature="23238:23295" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1582697933271" expanded="true" signature="23515:23584" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1582697933271" expanded="true" signature="23899:23968" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1582697933271" expanded="true" signature="24368:24417" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="24477:24526" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="24586:24637" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="29586:29646" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1582697933271" expanded="true" signature="29948:30010" ph="SELECT ISNUL... " />
+                <marker date="1582697933271" expanded="true" signature="30901:31154" ph="INSERT INTO MF_PSS... " />
+                <marker date="1582697933271" expanded="true" signature="32285:32521" ph="INSERT INTO MF_ARP... " />
+                <marker date="1582697933271" expanded="true" signature="33449:33704" ph="INSERT INTO MF_PSS... " />
+                <marker date="1582697933271" expanded="true" signature="34765:34974" ph="INSERT INTO TF_PSS... " />
+                <marker date="1582697933271" expanded="true" signature="39417:39474" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1582697933271" expanded="true" signature="39735:39804" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1582697933271" expanded="true" signature="40119:40188" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1582697933271" expanded="true" signature="40640:40700" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1582697933271" expanded="true" signature="41002:41064" ph="SELECT ISNUL... " />
+                <marker date="1582697933271" expanded="true" signature="42009:42147" ph="UPDATE MF_PS... " />
+                <marker date="1582697933271" expanded="true" signature="42862:42980" ph="UPDATE MF_AR... " />
+                <marker date="1582697933271" expanded="true" signature="43542:43773" ph="INSERT INTO MF_ARP... " />
+                <marker date="1582697933271" expanded="true" signature="44790:44928" ph="UPDATE MF_PS... " />
+                <marker date="1582697933271" expanded="true" signature="45536:45586" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="45796:45907" ph="UPDATE TF_PS... " />
+                <marker date="1582697933271" expanded="true" signature="47362:47419" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1582697933271" expanded="true" signature="47639:47708" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1582697933271" expanded="true" signature="48023:48092" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1582697933271" expanded="true" signature="48492:48541" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="48601:48650" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="48710:48761" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="53073:53133" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1582697933271" expanded="true" signature="53449:53500" ph="SELECT ISNUL... BACC" />
+                <marker date="1582697933271" expanded="true" signature="53955:54249" ph="INSERT INTO TF_MON... " />
+                <marker date="1582697933271" expanded="true" signature="55753:56033" ph="INSERT INTO TF_MON... " />
+                <marker date="1582697933271" expanded="true" signature="56445:56580" ph="INSERT INTO MF_MON... " />
+                <marker date="1582697933271" expanded="true" signature="57009:57232" ph="INSERT INTO MF_BAC... " />
+                <marker date="1582697933271" expanded="true" signature="58087:58241" ph="INSERT INTO TF_BAC... " />
+                <marker date="1582697933271" expanded="true" signature="62910:62970" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1582697933271" expanded="true" signature="63311:63362" ph="SELECT ISNUL... BACC" />
+                <marker date="1582697933271" expanded="true" signature="63838:63991" ph="UPDATE TF_MO... " />
+                <marker date="1582697933271" expanded="true" signature="64360:64514" ph="UPDATE TF_MO... " />
+                <marker date="1582697933271" expanded="true" signature="64779:64828" ph="UPDATE MF_MO... " />
+                <marker date="1582697933271" expanded="true" signature="65016:65103" ph="UPDATE MF_BA... " />
+                <marker date="1582697933271" expanded="true" signature="65380:65439" ph="UPDATE TF_BA... " />
+                <marker date="1582697933271" expanded="true" signature="66993:67040" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="67114:67162" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="67238:67271" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="67359:67392" ph="DELETE FROM " />
+                <marker date="1582697933271" expanded="true" signature="67912:67991" ph="SELECT table... TABLES" />
+                <marker date="1582697933271" expanded="true" signature="68183:68214" ph="SELECT COUNT... MF_LZ1_Z01" />
+                <marker date="1582697933271" expanded="true" signature="68396:68951" ph="SELECT ISNUL... MF_LZ1_Z01" />
+                <marker date="1582697933271" expanded="true" signature="69761:69806" ph="UPDATE MF_LZ... " />
+                <marker date="1582697933271" expanded="true" signature="70140:70218" ph="SELECT table... TABLES" />
+                <marker date="1582697933271" expanded="true" signature="70410:70440" ph="SELECT COUNT... MF_LZ_Z01" />
+                <marker date="1582697933271" expanded="true" signature="70627:71180" ph="SELECT ISNUL... MF_LZ_Z01" />
+                <marker date="1582697933271" expanded="true" signature="72013:72057" ph="UPDATE MF_LZ... " />
+                <marker date="1582697933271" expanded="true" signature="72785:72863" ph="SELECT table... TABLES" />
+                <marker date="1582697933271" expanded="true" signature="73054:73084" ph="SELECT COUNT... TC_MON_PC" />
+                <marker date="1582697933271" expanded="true" signature="73271:73752" ph="SELECT ISNUL... TC_MON_PC" />
+                <marker date="1582697933271" expanded="true" signature="74339:74383" ph="UPDATE TC_MO... " />
+                <marker date="1582697933271" expanded="true" signature="75148:75226" ph="SELECT table... TABLES" />
+                <marker date="1582697933271" expanded="true" signature="75417:75447" ph="SELECT COUNT... TC_MON_PC" />
+                <marker date="1582697933271" expanded="true" signature="75634:76079" ph="SELECT ISNUL... TC_MON_PC" />
+                <marker date="1582697933271" expanded="true" signature="76686:76730" ph="UPDATE TC_MO... " />
+                <marker date="1582697933271" expanded="true" signature="77494:77572" ph="SELECT table... TABLES" />
+                <marker date="1582697933271" expanded="true" signature="77763:77793" ph="SELECT COUNT... TC_MON_PC" />
+                <marker date="1582697933271" expanded="true" signature="77980:78497" ph="SELECT ISNUL... TC_MON_PC" />
+                <marker date="1582697933271" expanded="true" signature="79104:79148" ph="UPDATE TC_MO... " />
+                <marker date="1582697933271" expanded="true" signature="81087:81886" ph="SELECT TOP 1... " />
+                <marker date="1582697933271" expanded="true" signature="81925:82782" ph="SELECT TOP 1... " />
+                <marker date="1582697933271" expanded="true" signature="81925:82785" ph="SELECT TOP 5... " />
+                <marker date="1582697933271" expanded="true" signature="84637:84707" ph="UPDATE TF_PO... " />
+                <marker date="1582697933271" expanded="true" signature="84637:84718" ph="UPDATE TF_PO... " />
+                <marker date="1582697933271" expanded="true" signature="85273:85298" ph="SELECT DEP,N... DEPT" />
+                <marker date="1582697933271" expanded="true" signature="85796:85825" ph="SELECT TOP 5... MF_MO" />
+                <marker date="1582697933271" expanded="true" signature="86091:86153" ph="SELECT * FRO... CUST" />
               </folding>
             </state>
           </provider>
@@ -269,6 +272,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -314,28 +318,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="meibang" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="meibang" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="meib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="meib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="utils" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="meibang" />
@@ -360,7 +342,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -703,17 +684,16 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="2" width="1932" height="1045" extended-state="0" />
-    <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1826923" sideWeight="0.4949367" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18482906" sideWeight="0.4949367" 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="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="Version Control" 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="10" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" 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="8" 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.35455543" sideWeight="0.5" order="2" 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.36333698" sideWeight="0.5" order="2" 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="true" show_stripe_button="true" weight="0.32930845" sideWeight="0.5" order="9" 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.32930845" sideWeight="0.5" order="9" 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.16257995" sideWeight="0.5050633" order="2" side_tool="true" 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.3991323" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Data View" 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="4" side_tool="false" content_ui="tabs" />
@@ -747,20 +727,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/meib/manage.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="11" column="33" lean-forward="false" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/meib/meib/settings/dev.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4563">
-          <caret line="169" column="0" lean-forward="false" selection-start-line="169" selection-start-column="0" selection-end-line="169" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://F:/python/03Django/02Django_上上项目/0610_day14/2_code/meiduo12/meiduo_mall/meiduo_mall/templates/register.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1078,18 +1044,34 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$USER_HOME$/Envs/meibang/Lib/site-packages/django/http/request.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="213">
+          <caret line="51" column="13" lean-forward="false" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/meibang/Lib/site-packages/django/core/handlers/wsgi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="105" column="67" lean-forward="true" selection-start-line="105" selection-start-column="67" selection-end-line="105" selection-end-column="67" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/meib/meib/apps/erp/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="13" column="17" lean-forward="false" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="17" />
+        <state relative-caret-position="162">
+          <caret line="7" column="65" lean-forward="true" selection-start-line="7" selection-start-column="65" selection-end-line="7" selection-end-column="65" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/meib/meib/apps/erp/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="1713" column="30" lean-forward="false" selection-start-line="1713" selection-start-column="30" selection-end-line="1713" selection-end-column="30" />
+        <state relative-caret-position="405">
+          <caret line="1721" column="48" lean-forward="true" selection-start-line="1721" selection-start-column="48" selection-end-line="1721" selection-end-column="48" />
           <folding>
             <element signature="e#589#25007#0" expanded="false" />
             <element signature="e#655#689#0" expanded="false" />
@@ -1124,105 +1106,107 @@
             <element signature="e#77364#79344#0" expanded="false" />
             <element signature="e#77397#79344#0" expanded="false" />
             <element signature="e#79416#79452#0" expanded="false" />
-            <element signature="e#82910#82991#0" expanded="false" />
-            <element signature="e#83104#83584#0" expanded="false" />
-            <element signature="e#83648#83879#0" expanded="false" />
-            <element signature="e#83943#84206#0" expanded="false" />
-            <element signature="e#84279#84581#0" expanded="false" />
-            <element signature="e#84641#84676#0" expanded="false" />
-            <marker date="1582644401416" expanded="true" signature="4555:4615" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1582644401416" expanded="true" signature="4917:4979" ph="SELECT ISNUL... " />
-            <marker date="1582644401416" expanded="true" signature="5844:6074" ph="INSERT INTO MF_PSS... " />
-            <marker date="1582644401416" expanded="true" signature="7052:7105" ph="INSERT INTO MF_PSS_Z... " />
-            <marker date="1582644401416" expanded="true" signature="7242:7474" ph="INSERT INTO MF_ARP... " />
-            <marker date="1582644401416" expanded="true" signature="8401:8633" ph="INSERT INTO MF_PSS... " />
-            <marker date="1582644401416" expanded="true" signature="9575:9780" ph="INSERT INTO TF_PSS... " />
-            <marker date="1582644401416" expanded="true" signature="14798:14855" ph="SELECT ZHANG... MF_PSS" />
-            <marker date="1582644401416" expanded="true" signature="15026:15095" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1582644401416" expanded="true" signature="15364:15433" ph="SELECT ISNUL... MF_PSS" />
-            <marker date="1582644401416" expanded="true" signature="15835:15895" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1582644401416" expanded="true" signature="16197:16259" ph="SELECT ISNUL... " />
-            <marker date="1582644401416" expanded="true" signature="17169:17226" ph="UPDATE MF_PS... " />
-            <marker date="1582644401416" expanded="true" signature="17324:17381" ph="UPDATE MF_PS... " />
-            <marker date="1582644401416" expanded="true" signature="17516:17654" ph="UPDATE MF_PS... " />
-            <marker date="1582644401416" expanded="true" signature="18489:18607" ph="UPDATE MF_AR... " />
-            <marker date="1582644401416" expanded="true" signature="19232:19459" ph="INSERT INTO MF_ARP... " />
-            <marker date="1582644401416" expanded="true" signature="20476:20614" ph="UPDATE MF_PS... " />
-            <marker date="1582644401416" expanded="true" signature="21222:21272" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="21461:21572" ph="UPDATE TF_PS... " />
-            <marker date="1582644401416" expanded="true" signature="23238:23295" ph="SELECT ZHANG... MF_PSS" />
-            <marker date="1582644401416" expanded="true" signature="23515:23584" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1582644401416" expanded="true" signature="23899:23968" ph="SELECT ISNUL... MF_PSS" />
-            <marker date="1582644401416" expanded="true" signature="24368:24417" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="24477:24526" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="24586:24637" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="29586:29646" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1582644401416" expanded="true" signature="29948:30010" ph="SELECT ISNUL... " />
-            <marker date="1582644401416" expanded="true" signature="30901:31154" ph="INSERT INTO MF_PSS... " />
-            <marker date="1582644401416" expanded="true" signature="32285:32521" ph="INSERT INTO MF_ARP... " />
-            <marker date="1582644401416" expanded="true" signature="33449:33704" ph="INSERT INTO MF_PSS... " />
-            <marker date="1582644401416" expanded="true" signature="34765:34974" ph="INSERT INTO TF_PSS... " />
-            <marker date="1582644401416" expanded="true" signature="39417:39474" ph="SELECT ZHANG... MF_PSS" />
-            <marker date="1582644401416" expanded="true" signature="39735:39804" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1582644401416" expanded="true" signature="40119:40188" ph="SELECT ISNUL... MF_PSS" />
-            <marker date="1582644401416" expanded="true" signature="40640:40700" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1582644401416" expanded="true" signature="41002:41064" ph="SELECT ISNUL... " />
-            <marker date="1582644401416" expanded="true" signature="42009:42147" ph="UPDATE MF_PS... " />
-            <marker date="1582644401416" expanded="true" signature="42862:42980" ph="UPDATE MF_AR... " />
-            <marker date="1582644401416" expanded="true" signature="43542:43773" ph="INSERT INTO MF_ARP... " />
-            <marker date="1582644401416" expanded="true" signature="44790:44928" ph="UPDATE MF_PS... " />
-            <marker date="1582644401416" expanded="true" signature="45536:45586" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="45796:45907" ph="UPDATE TF_PS... " />
-            <marker date="1582644401416" expanded="true" signature="47362:47419" ph="SELECT ZHANG... MF_PSS" />
-            <marker date="1582644401416" expanded="true" signature="47639:47708" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1582644401416" expanded="true" signature="48023:48092" ph="SELECT ISNUL... MF_PSS" />
-            <marker date="1582644401416" expanded="true" signature="48492:48541" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="48601:48650" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="48710:48761" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="53073:53133" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1582644401416" expanded="true" signature="53449:53500" ph="SELECT ISNUL... BACC" />
-            <marker date="1582644401416" expanded="true" signature="53955:54249" ph="INSERT INTO TF_MON... " />
-            <marker date="1582644401416" expanded="true" signature="55753:56033" ph="INSERT INTO TF_MON... " />
-            <marker date="1582644401416" expanded="true" signature="56445:56580" ph="INSERT INTO MF_MON... " />
-            <marker date="1582644401416" expanded="true" signature="57009:57232" ph="INSERT INTO MF_BAC... " />
-            <marker date="1582644401416" expanded="true" signature="58087:58241" ph="INSERT INTO TF_BAC... " />
-            <marker date="1582644401416" expanded="true" signature="62910:62970" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1582644401416" expanded="true" signature="63311:63362" ph="SELECT ISNUL... BACC" />
-            <marker date="1582644401416" expanded="true" signature="63838:63991" ph="UPDATE TF_MO... " />
-            <marker date="1582644401416" expanded="true" signature="64360:64514" ph="UPDATE TF_MO... " />
-            <marker date="1582644401416" expanded="true" signature="64779:64828" ph="UPDATE MF_MO... " />
-            <marker date="1582644401416" expanded="true" signature="65016:65103" ph="UPDATE MF_BA... " />
-            <marker date="1582644401416" expanded="true" signature="65380:65439" ph="UPDATE TF_BA... " />
-            <marker date="1582644401416" expanded="true" signature="66993:67040" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="67114:67162" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="67238:67271" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="67359:67392" ph="DELETE FROM " />
-            <marker date="1582644401416" expanded="true" signature="67912:67991" ph="SELECT table... TABLES" />
-            <marker date="1582644401416" expanded="true" signature="68183:68214" ph="SELECT COUNT... MF_LZ1_Z01" />
-            <marker date="1582644401416" expanded="true" signature="68396:68951" ph="SELECT ISNUL... MF_LZ1_Z01" />
-            <marker date="1582644401416" expanded="true" signature="69761:69806" ph="UPDATE MF_LZ... " />
-            <marker date="1582644401416" expanded="true" signature="70140:70218" ph="SELECT table... TABLES" />
-            <marker date="1582644401416" expanded="true" signature="70410:70440" ph="SELECT COUNT... MF_LZ_Z01" />
-            <marker date="1582644401416" expanded="true" signature="70627:71180" ph="SELECT ISNUL... MF_LZ_Z01" />
-            <marker date="1582644401416" expanded="true" signature="72013:72057" ph="UPDATE MF_LZ... " />
-            <marker date="1582644401416" expanded="true" signature="72785:72863" ph="SELECT table... TABLES" />
-            <marker date="1582644401416" expanded="true" signature="73054:73084" ph="SELECT COUNT... TC_MON_PC" />
-            <marker date="1582644401416" expanded="true" signature="73271:73752" ph="SELECT ISNUL... TC_MON_PC" />
-            <marker date="1582644401416" expanded="true" signature="74339:74383" ph="UPDATE TC_MO... " />
-            <marker date="1582644401416" expanded="true" signature="75148:75226" ph="SELECT table... TABLES" />
-            <marker date="1582644401416" expanded="true" signature="75417:75447" ph="SELECT COUNT... TC_MON_PC" />
-            <marker date="1582644401416" expanded="true" signature="75634:76079" ph="SELECT ISNUL... TC_MON_PC" />
-            <marker date="1582644401416" expanded="true" signature="76686:76730" ph="UPDATE TC_MO... " />
-            <marker date="1582644401416" expanded="true" signature="77494:77572" ph="SELECT table... TABLES" />
-            <marker date="1582644401416" expanded="true" signature="77763:77793" ph="SELECT COUNT... TC_MON_PC" />
-            <marker date="1582644401416" expanded="true" signature="77980:78497" ph="SELECT ISNUL... TC_MON_PC" />
-            <marker date="1582644401416" expanded="true" signature="79104:79148" ph="UPDATE TC_MO... " />
-            <marker date="1582644401416" expanded="false" signature="79988:80778" ph="SELECT top 5... " />
-            <marker date="1582644401416" expanded="true" signature="82497:82567" ph="UPDATE TF_PO... " />
-            <marker date="1582644401416" expanded="true" signature="82497:82578" ph="UPDATE TF_PO... " />
-            <marker date="1582644401416" expanded="true" signature="83133:83158" ph="SELECT DEP,N... DEPT" />
-            <marker date="1582644401416" expanded="true" signature="83656:83685" ph="SELECT TOP 5... MF_MO" />
-            <marker date="1582644401416" expanded="true" signature="83951:84013" ph="SELECT * FRO... CUST" />
+            <element signature="e#85050#85131#0" expanded="false" />
+            <element signature="e#85244#85724#0" expanded="false" />
+            <element signature="e#85788#86019#0" expanded="false" />
+            <element signature="e#86083#86346#0" expanded="false" />
+            <element signature="e#86419#86721#0" expanded="false" />
+            <element signature="e#86781#86816#0" expanded="false" />
+            <marker date="1582697933271" expanded="true" signature="4555:4615" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1582697933271" expanded="true" signature="4917:4979" ph="SELECT ISNUL... " />
+            <marker date="1582697933271" expanded="true" signature="5844:6074" ph="INSERT INTO MF_PSS... " />
+            <marker date="1582697933271" expanded="true" signature="7052:7105" ph="INSERT INTO MF_PSS_Z... " />
+            <marker date="1582697933271" expanded="true" signature="7242:7474" ph="INSERT INTO MF_ARP... " />
+            <marker date="1582697933271" expanded="true" signature="8401:8633" ph="INSERT INTO MF_PSS... " />
+            <marker date="1582697933271" expanded="true" signature="9575:9780" ph="INSERT INTO TF_PSS... " />
+            <marker date="1582697933271" expanded="true" signature="14798:14855" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1582697933271" expanded="true" signature="15026:15095" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1582697933271" expanded="true" signature="15364:15433" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1582697933271" expanded="true" signature="15835:15895" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1582697933271" expanded="true" signature="16197:16259" ph="SELECT ISNUL... " />
+            <marker date="1582697933271" expanded="true" signature="17169:17226" ph="UPDATE MF_PS... " />
+            <marker date="1582697933271" expanded="true" signature="17324:17381" ph="UPDATE MF_PS... " />
+            <marker date="1582697933271" expanded="true" signature="17516:17654" ph="UPDATE MF_PS... " />
+            <marker date="1582697933271" expanded="true" signature="18489:18607" ph="UPDATE MF_AR... " />
+            <marker date="1582697933271" expanded="true" signature="19232:19459" ph="INSERT INTO MF_ARP... " />
+            <marker date="1582697933271" expanded="true" signature="20476:20614" ph="UPDATE MF_PS... " />
+            <marker date="1582697933271" expanded="true" signature="21222:21272" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="21461:21572" ph="UPDATE TF_PS... " />
+            <marker date="1582697933271" expanded="true" signature="23238:23295" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1582697933271" expanded="true" signature="23515:23584" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1582697933271" expanded="true" signature="23899:23968" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1582697933271" expanded="true" signature="24368:24417" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="24477:24526" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="24586:24637" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="29586:29646" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1582697933271" expanded="true" signature="29948:30010" ph="SELECT ISNUL... " />
+            <marker date="1582697933271" expanded="true" signature="30901:31154" ph="INSERT INTO MF_PSS... " />
+            <marker date="1582697933271" expanded="true" signature="32285:32521" ph="INSERT INTO MF_ARP... " />
+            <marker date="1582697933271" expanded="true" signature="33449:33704" ph="INSERT INTO MF_PSS... " />
+            <marker date="1582697933271" expanded="true" signature="34765:34974" ph="INSERT INTO TF_PSS... " />
+            <marker date="1582697933271" expanded="true" signature="39417:39474" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1582697933271" expanded="true" signature="39735:39804" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1582697933271" expanded="true" signature="40119:40188" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1582697933271" expanded="true" signature="40640:40700" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1582697933271" expanded="true" signature="41002:41064" ph="SELECT ISNUL... " />
+            <marker date="1582697933271" expanded="true" signature="42009:42147" ph="UPDATE MF_PS... " />
+            <marker date="1582697933271" expanded="true" signature="42862:42980" ph="UPDATE MF_AR... " />
+            <marker date="1582697933271" expanded="true" signature="43542:43773" ph="INSERT INTO MF_ARP... " />
+            <marker date="1582697933271" expanded="true" signature="44790:44928" ph="UPDATE MF_PS... " />
+            <marker date="1582697933271" expanded="true" signature="45536:45586" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="45796:45907" ph="UPDATE TF_PS... " />
+            <marker date="1582697933271" expanded="true" signature="47362:47419" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1582697933271" expanded="true" signature="47639:47708" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1582697933271" expanded="true" signature="48023:48092" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1582697933271" expanded="true" signature="48492:48541" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="48601:48650" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="48710:48761" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="53073:53133" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1582697933271" expanded="true" signature="53449:53500" ph="SELECT ISNUL... BACC" />
+            <marker date="1582697933271" expanded="true" signature="53955:54249" ph="INSERT INTO TF_MON... " />
+            <marker date="1582697933271" expanded="true" signature="55753:56033" ph="INSERT INTO TF_MON... " />
+            <marker date="1582697933271" expanded="true" signature="56445:56580" ph="INSERT INTO MF_MON... " />
+            <marker date="1582697933271" expanded="true" signature="57009:57232" ph="INSERT INTO MF_BAC... " />
+            <marker date="1582697933271" expanded="true" signature="58087:58241" ph="INSERT INTO TF_BAC... " />
+            <marker date="1582697933271" expanded="true" signature="62910:62970" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1582697933271" expanded="true" signature="63311:63362" ph="SELECT ISNUL... BACC" />
+            <marker date="1582697933271" expanded="true" signature="63838:63991" ph="UPDATE TF_MO... " />
+            <marker date="1582697933271" expanded="true" signature="64360:64514" ph="UPDATE TF_MO... " />
+            <marker date="1582697933271" expanded="true" signature="64779:64828" ph="UPDATE MF_MO... " />
+            <marker date="1582697933271" expanded="true" signature="65016:65103" ph="UPDATE MF_BA... " />
+            <marker date="1582697933271" expanded="true" signature="65380:65439" ph="UPDATE TF_BA... " />
+            <marker date="1582697933271" expanded="true" signature="66993:67040" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="67114:67162" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="67238:67271" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="67359:67392" ph="DELETE FROM " />
+            <marker date="1582697933271" expanded="true" signature="67912:67991" ph="SELECT table... TABLES" />
+            <marker date="1582697933271" expanded="true" signature="68183:68214" ph="SELECT COUNT... MF_LZ1_Z01" />
+            <marker date="1582697933271" expanded="true" signature="68396:68951" ph="SELECT ISNUL... MF_LZ1_Z01" />
+            <marker date="1582697933271" expanded="true" signature="69761:69806" ph="UPDATE MF_LZ... " />
+            <marker date="1582697933271" expanded="true" signature="70140:70218" ph="SELECT table... TABLES" />
+            <marker date="1582697933271" expanded="true" signature="70410:70440" ph="SELECT COUNT... MF_LZ_Z01" />
+            <marker date="1582697933271" expanded="true" signature="70627:71180" ph="SELECT ISNUL... MF_LZ_Z01" />
+            <marker date="1582697933271" expanded="true" signature="72013:72057" ph="UPDATE MF_LZ... " />
+            <marker date="1582697933271" expanded="true" signature="72785:72863" ph="SELECT table... TABLES" />
+            <marker date="1582697933271" expanded="true" signature="73054:73084" ph="SELECT COUNT... TC_MON_PC" />
+            <marker date="1582697933271" expanded="true" signature="73271:73752" ph="SELECT ISNUL... TC_MON_PC" />
+            <marker date="1582697933271" expanded="true" signature="74339:74383" ph="UPDATE TC_MO... " />
+            <marker date="1582697933271" expanded="true" signature="75148:75226" ph="SELECT table... TABLES" />
+            <marker date="1582697933271" expanded="true" signature="75417:75447" ph="SELECT COUNT... TC_MON_PC" />
+            <marker date="1582697933271" expanded="true" signature="75634:76079" ph="SELECT ISNUL... TC_MON_PC" />
+            <marker date="1582697933271" expanded="true" signature="76686:76730" ph="UPDATE TC_MO... " />
+            <marker date="1582697933271" expanded="true" signature="77494:77572" ph="SELECT table... TABLES" />
+            <marker date="1582697933271" expanded="true" signature="77763:77793" ph="SELECT COUNT... TC_MON_PC" />
+            <marker date="1582697933271" expanded="true" signature="77980:78497" ph="SELECT ISNUL... TC_MON_PC" />
+            <marker date="1582697933271" expanded="true" signature="79104:79148" ph="UPDATE TC_MO... " />
+            <marker date="1582697933271" expanded="true" signature="81087:81886" ph="SELECT TOP 1... " />
+            <marker date="1582697933271" expanded="true" signature="81925:82782" ph="SELECT TOP 1... " />
+            <marker date="1582697933271" expanded="true" signature="81925:82785" ph="SELECT TOP 5... " />
+            <marker date="1582697933271" expanded="true" signature="84637:84707" ph="UPDATE TF_PO... " />
+            <marker date="1582697933271" expanded="true" signature="84637:84718" ph="UPDATE TF_PO... " />
+            <marker date="1582697933271" expanded="true" signature="85273:85298" ph="SELECT DEP,N... DEPT" />
+            <marker date="1582697933271" expanded="true" signature="85796:85825" ph="SELECT TOP 5... MF_MO" />
+            <marker date="1582697933271" expanded="true" signature="86091:86153" ph="SELECT * FRO... CUST" />
           </folding>
         </state>
       </provider>

meib/meib/apps/erp/views.py

@@ -1684,25 +1684,74 @@ class listtb(View):
         # req_data = json.loads(request.body.decode())["params"]
         # print(req_data)
         st_time = request.GET["st_time"]  # 开始时间
-        st_time = request.GET['st_time']
         sh_time = request.GET['sh_time']
         cus_no = request.GET['cus_no']
         cls_id = request.GET['cls_id']
-        pmc_ok = request.GET['pmc_ok']
+        PMC_REM = request.GET['pmc_ok']
+        sort = request.GET['sort']
+        print(st_time)
+        print(sh_time)
         print(cus_no)
+        print(cls_id)
+        print(PMC_REM)
+        print(sort)
+        # 处理客户代号
+        if cus_no:
+            cus_no = ' AND '+ 'A.CUS_NO='+"'"+cus_no+"'"
+            print(cus_no)
+        # 处理结案否
+        if cls_id:
+            if cls_id =='1':
+                cls_id = ''
+            elif cls_id == '2':
+                cls_id = 'T'
+                cls_id = ' AND '+ 'A.CLS_ID ='+"'"+cls_id+"'"
+            else:
+                cls_id = ' AND ' + 'A.CLS_ID !=' + "'" + 'T' + "'"
+        # 处理是否回复
+        if PMC_REM:
+            if PMC_REM =='1':
+                PMC_REM = ''
+            elif PMC_REM == '2':
+                PMC_REM = ' AND '+ "ISNULL(C.PMC_REM,'') != ''"
+            else:
+                PMC_REM = ' AND ' + "ISNULL(C.PMC_REM,'') = ''"
+        if sort:
+            # F.SPC_NO
+            if sort == '1':
+                sort = ' ORDER BY F.SPC_NO DESC'
+            if sort == '2':
+                sort = ' ORDER BY A.CUS_NO DESC'
+            else:
+                sort = ' ORDER BY C.PMC_REM DESC'
+        conditional = cus_no+cls_id+PMC_REM+sort
+        print(conditional)
         # ["params"]
-
-        with connection.cursor() as cursor:
-            no_data = cursor.execute("""SELECT TOP 5 CASE WHEN F.NAME LIKE '%%返工%%' THEN '返工' ELSE '订单' END AS ORDER0 ,ISNULL(B.OS_DD,'') AS OS_DD,
+        if st_time =='':
+            sql = """SELECT TOP 1000 CASE WHEN F.NAME LIKE '%%返工%%' THEN '返工' ELSE '订单' END AS ORDER0 ,ISNULL(B.OS_DD,'') AS OS_DD,
 ISNULL(D.SNM,'') AS CUS_SNM,B.OS_NO AS OS_NO,B.PRD_NO AS PRD_NO,ISNULL(E.DZRL,'') AS DZRL,'' AS RQ,ISNULL(E.YSSL,'') AS YSSL,'' AS YMXH,
-ISNULL(B.QTY,0) AS QTY,ISNULL(E.YSSL *B.QTY,0) AS GZSL,B.EST_DD AS EST_DD,'' AS PD_DEP,ISNULL(B.REM,'') AS REM,CONVERT(CHAR(10), C.PMC_REM, 23) AS PMC_DD, '' AS WH_REM,
+ISNULL(B.QTY,0) AS QTY,ISNULL(E.YSSL *B.QTY,0) AS GZSL,B.EST_DD AS EST_DD,'' AS PD_DEP,ISNULL(B.REM,'') AS REM,CONVERT(CHAR(10), C.PMC_REM, 23) AS PMC_DD, C.WH_REM AS WH_REM,
  B.ITM AS ITM FROM MF_POS A 
 LEFT JOIN TF_POS B ON A.OS_NO=B.OS_NO 
 LEFT JOIN TF_POS_Z C ON B.OS_NO=C.OS_NO AND B.ITM=C.ITM
 LEFT JOIN CUST D ON A.CUS_NO=D.CUS_NO 
 LEFT JOIN PRDT_Z E ON B.PRD_NO=E.PRD_NO 
 LEFT JOIN BIL_SPC F ON A.BIL_TYPE=F.SPC_NO AND F.BIL_ID='SA'
-WHERE   A.OS_ID='SO' AND B.OS_ID=A.OS_ID AND C.OS_ID=A.OS_ID AND ISNULL(A.CLS_ID,'')!='T' ORDER BY A.OS_NO DESC""",[]).fetchall()
+WHERE   A.OS_ID='SO' AND B.OS_ID=A.OS_ID AND C.OS_ID=A.OS_ID AND ISNULL(A.CLS_ID,'')!='T' ORDER BY A.OS_NO DESC"""
+        else:
+            sql = """SELECT TOP 1000 CASE WHEN F.NAME LIKE '%%返工%%' THEN '返工' ELSE '订单' END AS ORDER0 ,ISNULL(B.OS_DD,'') AS OS_DD,
+            ISNULL(D.SNM,'') AS CUS_SNM,B.OS_NO AS OS_NO,B.PRD_NO AS PRD_NO,ISNULL(E.DZRL,'') AS DZRL,'' AS RQ,ISNULL(E.YSSL,'') AS YSSL,'' AS YMXH,
+            ISNULL(B.QTY,0) AS QTY,ISNULL(E.YSSL *B.QTY,0) AS GZSL,B.EST_DD AS EST_DD,'' AS PD_DEP,ISNULL(B.REM,'') AS REM,CONVERT(CHAR(10), C.PMC_REM, 23) AS PMC_DD, C.WH_REM AS WH_REM,
+             B.ITM AS ITM FROM MF_POS A 
+            LEFT JOIN TF_POS B ON A.OS_NO=B.OS_NO 
+            LEFT JOIN TF_POS_Z C ON B.OS_NO=C.OS_NO AND B.ITM=C.ITM
+            LEFT JOIN CUST D ON A.CUS_NO=D.CUS_NO 
+            LEFT JOIN PRDT_Z E ON B.PRD_NO=E.PRD_NO 
+            LEFT JOIN BIL_SPC F ON A.BIL_TYPE=F.SPC_NO AND F.BIL_ID='SA'
+            WHERE   A.OS_ID='SO' AND B.OS_ID=A.OS_ID AND C.OS_ID=A.OS_ID {0}""".format(conditional)
+        print(sql)
+        with connection.cursor() as cursor:
+            no_data = cursor.execute(sql,[]).fetchall()
         data = [
                     {"ORDER0": "类别", "OS_DD": '下单日期', "CUS_SNM": "客户名称",
                      "OS_NO":"计划单号","PRD_NO":"产品编码","DZRL":"容量（ML）",

meib/meib/static/js/bootstrap-select_new.js

@@ -1023,8 +1023,8 @@
           }
   
           that.$menu.find('li.active').removeClass('active');
-        //   that.$menu.find('li').filter(':visible:not(.divider)').eq(0).addClass('active').find('a').focus();
-        //   $(this).focus();
+          // that.$menu.find('li').filter(':visible:not(.divider)').eq(0).addClass('active').find('a').focus();
+          // $(this).focus();
         });
       },
   

meib/meib/templates/order.html

@@ -267,15 +267,24 @@
                 DEP_DEP: '',
                 list_cust: [],
                 cust_cus_no: '',
-                sort: '1'
+                sort: '1',
+                cust_cus_no_aa:''
             },
             methods: {
                 seek() { // 添加的方法
-                    console.log('ok')
+                    // console.log('ok')
                     // 添加一个对象用于增加数据
-                    this.cust_cus_no = $("#field").selectpicker('val')
+                    if($("#field").selectpicker('val') !=''){
+                        this.cust_cus_no_aa = $("#field").selectpicker('val')
+                        this.cust_cus_no = $("#field").selectpicker('val')
+                    }
+
+                    if ($("#field").selectpicker('val')==''){
+                        this.cust_cus_no = this.cust_cus_no_aa
+                    }
+                    // console.log($("#field").selectpicker('val'))
                     var seek = { st_time: this.st_time, sh_time: this.sh_time, cus_no: this.cust_cus_no, cls_id: this.cls_id, pmc_ok: this.pmc_ok, sort: this.sort }
-                    console.log(seek)
+                    // console.log(seek)
                     axios.get('/listtb', {
                         params: {
                             st_time: this.st_time,
@@ -289,6 +298,7 @@
                         .then(res => {
                             // alert(res.data)
                             var data1 = res.data.data
+                            this.list = data1
 
                         })
                         .catch(err => {
@@ -296,8 +306,8 @@
                         })
                 },
                 ok_save(OS_NO, PMC_DD, WH_REM, ITM, i) {
-                    console.log('ok1')
-                    console.log(OS_NO, PMC_DD, WH_REM, ITM)
+                    // console.log('ok1')
+                    // console.log(OS_NO, PMC_DD, WH_REM, ITM)
                     this.activeIndex = i
                     var OS_NO = OS_NO
                     var PMC_DD = PMC_DD
@@ -331,6 +341,7 @@
                             cus_no: '',
                             cls_id: '',
                             pmc_ok: '',
+                            sort:
                         }
                     })
                         .then(res => {
@@ -341,7 +352,7 @@
 
                             this.list = data1
                             $(".footer").remove();
-                            console.log(this.list)
+                            // console.log(this.list)
                         })
                         .catch(err => {
                             console.log('error:' + err)
@@ -361,7 +372,7 @@
                         strDate = "0" + strDate;
                     }
                     var currentdate = year + seperator1 + month + seperator1 + strDate;
-                    console.log(currentdate)
+                    // console.log(currentdate)
                     this.st_time = this.sh_time = currentdate
                 },
                 //获取客户资料
@@ -392,6 +403,8 @@
                             // 更新 。 这一步很重要
                             $('#field').selectpicker('refresh');
 
+                            //  $('#field').selectpicker('refresh');
+
                         })
                         .catch(err => {
                             console.log('error:' + err)

meib/meib/templates/zz.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <script src="../static/js/vue-2.4.0.js"></script>
+    <script src="../static/js/vue-router.js"></script>
+</head>
+<body>
+
+    <script>
+
+
+
+    const 
+
+
+
+
+    const mv  =  new Vue({
+            el:'',
+            data:{
+
+            },
+            methods: {
+                
+            },
+        })
+
+    </script>
+</body>
+</html>