홈 탐색 도움말
로그인
rencuiliang
/
meibang
1
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

今天代码完成

任翠亮 4 년 전
부모
a05e509efa
커밋
f3068a853a
14개의 변경된 파일과 9375개의 추가작업 그리고 1015개의 파일을 삭제
분할 보기 변경상태 보기
  1. 395 347
      .idea/workspace.xml
  2. 7216 0
      meib/logs/hwj.log
  3. 11 9
      meib/meib/apps/erp/lianxi.py
  4. 7 2
      meib/meib/apps/erp/urls.py
  5. 376 101
      meib/meib/apps/erp/views.py
  6. 99 0
      meib/meib/static/css/iefile.css
  7. 5 0
      meib/meib/static/css/macf.css
  8. 29 0
      meib/meib/static/js/ionicons.js
  9. 93 79
      meib/meib/static/js/jquery.select.js
  10. 232 159
      meib/meib/templates/dep_ps.html
  11. 297 0
      meib/meib/templates/dessetting.html
  12. 479 0
      meib/meib/templates/iefile.html
  13. 118 176
      meib/meib/templates/order.html
  14. 18 142
      meib/meib/templates/text.html

+ 395 - 347
.idea/workspace.xml
파일 보기 

@@ -4,21 +4,21 @@
 
     <bookmark url="file://$PROJECT_DIR$/meib/meib/settings/lianxi.py" line="11" />
 
   </component>
 
   <component name="ChangeListManager">
 
-    <list default="true" id="11c83ff8-0ec9-44da-868f-563af5d42189" name="Default" comment="分页完成o">
 
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/meib/meib/static/js/vue-Cookies.js" />
 
+    <list default="true" id="11c83ff8-0ec9-44da-868f-563af5d42189" name="Default" comment="">
 
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/meib/meib/static/css/iefile.css" />
 
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/meib/meib/static/js/ionicons.js" />
 
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/meib/meib/templates/dessetting.html" />
 
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/meib/meib/templates/iefile.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/lianxi.py" afterPath="$PROJECT_DIR$/meib/meib/apps/erp/lianxi.py" />
 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/apps/erp/urls.py" afterPath="$PROJECT_DIR$/meib/meib/apps/erp/urls.py" />
 
       <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/apps/users/urls.py" afterPath="$PROJECT_DIR$/meib/meib/apps/users/urls.py" />
 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/apps/users/views.py" afterPath="$PROJECT_DIR$/meib/meib/apps/users/views.py" />
 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/settings/dev.py" afterPath="$PROJECT_DIR$/meib/meib/settings/dev.py" />
 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/static/css/css.css" afterPath="$PROJECT_DIR$/meib/meib/static/css/css.css" />
 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/static/css/macf.css" afterPath="$PROJECT_DIR$/meib/meib/static/css/macf.css" />
 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/static/js/jquery.select.js" afterPath="$PROJECT_DIR$/meib/meib/static/js/jquery.select.js" />
 
       <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/templates/login.html" afterPath="$PROJECT_DIR$/meib/meib/templates/login.html" />
 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/templates/order.html" afterPath="$PROJECT_DIR$/meib/meib/templates/order.html" />
 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/utils/middleware.py" afterPath="$PROJECT_DIR$/meib/meib/utils/middleware.py" />
 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/meib/meib/templates/text.html" afterPath="$PROJECT_DIR$/meib/meib/templates/text.html" />
 
     </list>
 
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
 
     <option name="TRACKING_ENABLED" value="true" />
 
@@ -29,9 +29,9 @@
 
   </component>
 
   <component name="CoverageDataManager">
 
     <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="1583914407310" 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="1584091799392" 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="1583918334777" 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="1584520246537" 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$lianxi__1_.coverage" NAME="lianxi (1) Coverage Results" MODIFIED="1583498862279" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/meib/meib/settings" />
 
   </component>
 
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
 
@@ -43,8 +43,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="273">
 
-              <caret line="1961" column="36" lean-forward="true" selection-start-line="1961" selection-start-column="36" selection-end-line="1961" selection-end-column="36" />
 
+            <state relative-caret-position="243">
 
+              <caret line="2315" column="23" lean-forward="true" selection-start-line="2315" selection-start-column="23" selection-end-line="2315" selection-end-column="23" />
 
               <folding>
 
                 <element signature="e#0#35#0" expanded="true" />
 
                 <element signature="e#697#731#0" expanded="false" />
 
@@ -54,154 +54,178 @@
 
                 <element signature="e#25141#25299#0" expanded="false" />
 
                 <element signature="e#25362#36221#0" expanded="false" />
 
                 <element signature="e#36283#46612#0" expanded="false" />
 
-                <element signature="e#46677#49180#0" expanded="false" />
 
+                <element signature="e#47350#48339#0" expanded="false" />
 
                 <element signature="e#49216#67801#0" expanded="false" />
 
                 <element signature="e#67835#70030#0" expanded="false" />
 
                 <element signature="e#70064#72308#0" expanded="false" />
 
                 <element signature="e#72308#72316#0" expanded="false" />
 
                 <element signature="e#72710#74637#0" expanded="false" />
 
                 <element signature="e#75074#76983#0" expanded="false" />
 
-                <element signature="e#77421#79402#0" expanded="false" />
 
-                <element signature="e#79586#89282#0" expanded="false" />
 
-                <element signature="e#90944#93494#0" expanded="false" />
 
-                <element signature="e#93766#94322#0" expanded="false" />
 
-                <element signature="e#94384#95492#0" expanded="false" />
 
-                <element signature="e#95556#96692#0" expanded="false" />
 
-                <element signature="e#95633#95914#0" expanded="false" />
 
-                <element signature="e#96755#96987#0" expanded="false" />
 
-                <element signature="e#97994#98297#0" expanded="false" />
 
-                <marker date="1583918384697" expanded="true" signature="4597:4657" ph="SELECT COUNT... MF_VHID" />
 
-                <marker date="1583918384697" expanded="true" signature="4959:5021" ph="SELECT ISNUL... " />
 
-                <marker date="1583918384697" expanded="true" signature="5886:6116" ph="INSERT INTO MF_PSS... " />
 
-                <marker date="1583918384697" expanded="true" signature="7094:7147" ph="INSERT INTO MF_PSS_Z... " />
 
-                <marker date="1583918384697" expanded="true" signature="7284:7516" ph="INSERT INTO MF_ARP... " />
 
-                <marker date="1583918384697" expanded="true" signature="8443:8675" ph="INSERT INTO MF_PSS... " />
 
-                <marker date="1583918384697" expanded="true" signature="9617:9822" ph="INSERT INTO TF_PSS... " />
 
-                <marker date="1583918384697" expanded="true" signature="14842:14899" ph="SELECT ZHANG... MF_PSS" />
 
-                <marker date="1583918384697" expanded="true" signature="15070:15139" ph="SELECT ISNUL... MF_ARP" />
 
-                <marker date="1583918384697" expanded="true" signature="15408:15477" ph="SELECT ISNUL... MF_PSS" />
 
-                <marker date="1583918384697" expanded="true" signature="15879:15939" ph="SELECT COUNT... MF_VHID" />
 
-                <marker date="1583918384697" expanded="true" signature="16241:16303" ph="SELECT ISNUL... " />
 
-                <marker date="1583918384697" expanded="true" signature="17213:17270" ph="UPDATE MF_PS... " />
 
-                <marker date="1583918384697" expanded="true" signature="17368:17425" ph="UPDATE MF_PS... " />
 
-                <marker date="1583918384697" expanded="true" signature="17560:17698" ph="UPDATE MF_PS... " />
 
-                <marker date="1583918384697" expanded="true" signature="18533:18651" ph="UPDATE MF_AR... " />
 
-                <marker date="1583918384697" expanded="true" signature="19276:19503" ph="INSERT INTO MF_ARP... " />
 
-                <marker date="1583918384697" expanded="true" signature="20520:20658" ph="UPDATE MF_PS... " />
 
-                <marker date="1583918384697" expanded="true" signature="21266:21316" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="21505:21616" ph="UPDATE TF_PS... " />
 
-                <marker date="1583918384697" expanded="true" signature="23283:23340" ph="SELECT ZHANG... MF_PSS" />
 
-                <marker date="1583918384697" expanded="true" signature="23560:23629" ph="SELECT ISNUL... MF_ARP" />
 
-                <marker date="1583918384697" expanded="true" signature="23944:24013" ph="SELECT ISNUL... MF_PSS" />
 
-                <marker date="1583918384697" expanded="true" signature="24413:24462" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="24522:24571" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="24631:24682" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="29632:29692" ph="SELECT COUNT... MF_VHID" />
 
-                <marker date="1583918384697" expanded="true" signature="29994:30056" ph="SELECT ISNUL... " />
 
-                <marker date="1583918384697" expanded="true" signature="30947:31200" ph="INSERT INTO MF_PSS... " />
 
-                <marker date="1583918384697" expanded="true" signature="32331:32567" ph="INSERT INTO MF_ARP... " />
 
-                <marker date="1583918384697" expanded="true" signature="33495:33750" ph="INSERT INTO MF_PSS... " />
 
-                <marker date="1583918384697" expanded="true" signature="34811:35020" ph="INSERT INTO TF_PSS... " />
 
-                <marker date="1583918384697" expanded="true" signature="39465:39522" ph="SELECT ZHANG... MF_PSS" />
 
-                <marker date="1583918384697" expanded="true" signature="39783:39852" ph="SELECT ISNUL... MF_ARP" />
 
-                <marker date="1583918384697" expanded="true" signature="40167:40236" ph="SELECT ISNUL... MF_PSS" />
 
-                <marker date="1583918384697" expanded="true" signature="40688:40748" ph="SELECT COUNT... MF_VHID" />
 
-                <marker date="1583918384697" expanded="true" signature="41050:41112" ph="SELECT ISNUL... " />
 
-                <marker date="1583918384697" expanded="true" signature="42057:42195" ph="UPDATE MF_PS... " />
 
-                <marker date="1583918384697" expanded="true" signature="42910:43028" ph="UPDATE MF_AR... " />
 
-                <marker date="1583918384697" expanded="true" signature="43590:43821" ph="INSERT INTO MF_ARP... " />
 
-                <marker date="1583918384697" expanded="true" signature="44838:44976" ph="UPDATE MF_PS... " />
 
-                <marker date="1583918384697" expanded="true" signature="45584:45634" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="45844:45955" ph="UPDATE TF_PS... " />
 
-                <marker date="1583918384697" expanded="true" signature="47411:47468" ph="SELECT ZHANG... MF_PSS" />
 
-                <marker date="1583918384697" expanded="true" signature="47688:47757" ph="SELECT ISNUL... MF_ARP" />
 
-                <marker date="1583918384697" expanded="true" signature="48072:48141" ph="SELECT ISNUL... MF_PSS" />
 
-                <marker date="1583918384697" expanded="true" signature="48541:48590" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="48650:48699" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="48759:48810" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="53123:53183" ph="SELECT COUNT... MF_VHID" />
 
-                <marker date="1583918384697" expanded="true" signature="53499:53550" ph="SELECT ISNUL... BACC" />
 
-                <marker date="1583918384697" expanded="true" signature="54005:54299" ph="INSERT INTO TF_MON... " />
 
-                <marker date="1583918384697" expanded="true" signature="55803:56083" ph="INSERT INTO TF_MON... " />
 
-                <marker date="1583918384697" expanded="true" signature="56495:56630" ph="INSERT INTO MF_MON... " />
 
-                <marker date="1583918384697" expanded="true" signature="57059:57282" ph="INSERT INTO MF_BAC... " />
 
-                <marker date="1583918384697" expanded="true" signature="58137:58291" ph="INSERT INTO TF_BAC... " />
 
-                <marker date="1583918384697" expanded="true" signature="62961:63021" ph="SELECT COUNT... MF_VHID" />
 
-                <marker date="1583918384697" expanded="true" signature="63362:63413" ph="SELECT ISNUL... BACC" />
 
-                <marker date="1583918384697" expanded="true" signature="63889:64042" ph="UPDATE TF_MO... " />
 
-                <marker date="1583918384697" expanded="true" signature="64411:64565" ph="UPDATE TF_MO... " />
 
-                <marker date="1583918384697" expanded="true" signature="64830:64879" ph="UPDATE MF_MO... " />
 
-                <marker date="1583918384697" expanded="true" signature="65067:65154" ph="UPDATE MF_BA... " />
 
-                <marker date="1583918384697" expanded="true" signature="65431:65490" ph="UPDATE TF_BA... " />
 
-                <marker date="1583918384697" expanded="true" signature="67045:67092" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="67166:67214" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="67290:67323" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="67411:67444" ph="DELETE FROM " />
 
-                <marker date="1583918384697" expanded="true" signature="67965:68044" ph="SELECT table... TABLES" />
 
-                <marker date="1583918384697" expanded="true" signature="68236:68267" ph="SELECT COUNT... MF_LZ1_Z01" />
 
-                <marker date="1583918384697" expanded="true" signature="68449:69004" ph="SELECT ISNUL... MF_LZ1_Z01" />
 
-                <marker date="1583918384697" expanded="true" signature="69814:69859" ph="UPDATE MF_LZ... " />
 
-                <marker date="1583918384697" expanded="true" signature="70194:70272" ph="SELECT table... TABLES" />
 
-                <marker date="1583918384697" expanded="true" signature="70464:70494" ph="SELECT COUNT... MF_LZ_Z01" />
 
-                <marker date="1583918384697" expanded="true" signature="70681:71234" ph="SELECT ISNUL... MF_LZ_Z01" />
 
-                <marker date="1583918384697" expanded="true" signature="72067:72111" ph="UPDATE MF_LZ... " />
 
-                <marker date="1583918384697" expanded="true" signature="72840:72918" ph="SELECT table... TABLES" />
 
-                <marker date="1583918384697" expanded="true" signature="73109:73139" ph="SELECT COUNT... TC_MON_PC" />
 
-                <marker date="1583918384697" expanded="true" signature="73326:73807" ph="SELECT ISNUL... TC_MON_PC" />
 
-                <marker date="1583918384697" expanded="true" signature="74394:74438" ph="UPDATE TC_MO... " />
 
-                <marker date="1583918384697" expanded="true" signature="75204:75282" ph="SELECT table... TABLES" />
 
-                <marker date="1583918384697" expanded="true" signature="75473:75503" ph="SELECT COUNT... TC_MON_PC" />
 
-                <marker date="1583918384697" expanded="true" signature="75690:76135" ph="SELECT ISNUL... TC_MON_PC" />
 
-                <marker date="1583918384697" expanded="true" signature="76742:76786" ph="UPDATE TC_MO... " />
 
-                <marker date="1583918384697" expanded="true" signature="77551:77629" ph="SELECT table... TABLES" />
 
-                <marker date="1583918384697" expanded="true" signature="77820:77850" ph="SELECT COUNT... TC_MON_PC" />
 
-                <marker date="1583918384697" expanded="true" signature="78037:78554" ph="SELECT ISNUL... TC_MON_PC" />
 
-                <marker date="1583918384697" expanded="true" signature="79161:79205" ph="UPDATE TC_MO... " />
 
-                <marker date="1583918384697" expanded="true" signature="84007:84055" ph="SELECT COUNT... View_aa" />
 
-                <marker date="1583918384697" expanded="true" signature="84683:85266" ph="SELECT TOP m... " />
 
-                <marker date="1583918384697" expanded="true" signature="86485:86562" ph="SELECT COUNT... OS_NO" />
 
-                <marker date="1583918384697" expanded="true" signature="86520:86556" ph="SELECT OS_NO... View_aa" />
 
-                <marker date="1583918384697" expanded="true" signature="87349:88255" ph="SELECT TOP m... View_aa" />
 
-                <marker date="1583918384697" expanded="true" signature="89838:89919" ph="UPDATE TF_PO... " />
 
-                <marker date="1583918384697" expanded="true" signature="90993:91038" ph="SELECT MAX(N... " />
 
-                <marker date="1583918384697" expanded="true" signature="92633:93036" ph="INSERT INTO mcaf... " />
 
-                <marker date="1583918384697" expanded="true" signature="93843:93894" ph="SELECT DEP,N... DEPT" />
 
-                <marker date="1583918384697" expanded="true" signature="94659:94694" ph="SELECT PRD_N... PRDT" />
 
-                <marker date="1583918384697" expanded="true" signature="94754:94790" ph="SELECT top 1... PRDT" />
 
-                <marker date="1583918384697" expanded="true" signature="95854:95890" ph="SELECT CUS_N... CUST" />
 
-                <marker date="1583918384697" expanded="true" signature="95950:95986" ph="SELECT top 1... CUST" />
 
-                <marker date="1583918384697" expanded="true" signature="96763:96792" ph="SELECT TOP 5... MF_MO" />
 
-                <marker date="1583918384697" expanded="false" signature="97133:97721" ph="SELECT b.dep... mf_mo" />
 
+                <element signature="e#77421#79403#0" expanded="false" />
 
+                <element signature="e#79466#80264#0" expanded="false" />
 
+                <element signature="e#79543#79817#0" expanded="false" />
 
+                <element signature="e#80328#81466#0" expanded="false" />
 
+                <element signature="e#81530#82669#0" expanded="false" />
 
+                <element signature="e#82734#83873#0" expanded="false" />
 
+                <element signature="e#83265#83565#0" expanded="false" />
 
+                <element signature="e#83936#84820#0" expanded="false" />
 
+                <element signature="e#84868#84937#0" expanded="false" />
 
+                <element signature="e#85005#94742#0" expanded="false" />
 
+                <element signature="e#94779#95650#0" expanded="false" />
 
+                <element signature="e#95730#95767#0" expanded="false" />
 
+                <element signature="e#95836#97860#0" expanded="false" />
 
+                <element signature="e#96565#96583#0" expanded="false" />
 
+                <element signature="e#101063#103718#0" expanded="false" />
 
+                <element signature="e#101252#103591#0" expanded="false" />
 
+                <element signature="e#103757#104504#0" expanded="false" />
 
+                <element signature="e#104587#105573#0" expanded="false" />
 
+                <element signature="e#105645#105948#0" expanded="false" />
 
+                <element signature="e#105993#106065#0" expanded="false" />
 
+                <element signature="e#106142#107442#0" expanded="false" />
 
+                <element signature="e#107478#108233#0" expanded="false" />
 
+                <element signature="e#108305#108341#0" expanded="false" />
 
+                <element signature="e#108411#108530#0" expanded="false" />
 
+                <element signature="e#108421#108488#0" expanded="false" />
 
+                <marker date="1584523553858" expanded="true" signature="4597:4657" ph="SELECT COUNT... MF_VHID" />
 
+                <marker date="1584523553858" expanded="true" signature="4959:5021" ph="SELECT ISNUL... " />
 
+                <marker date="1584523553858" expanded="true" signature="5886:6116" ph="INSERT INTO MF_PSS... " />
 
+                <marker date="1584523553858" expanded="true" signature="7094:7147" ph="INSERT INTO MF_PSS_Z... " />
 
+                <marker date="1584523553858" expanded="true" signature="7284:7516" ph="INSERT INTO MF_ARP... " />
 
+                <marker date="1584523553858" expanded="true" signature="8443:8675" ph="INSERT INTO MF_PSS... " />
 
+                <marker date="1584523553858" expanded="true" signature="9617:9822" ph="INSERT INTO TF_PSS... " />
 
+                <marker date="1584523553858" expanded="true" signature="14842:14899" ph="SELECT ZHANG... MF_PSS" />
 
+                <marker date="1584523553858" expanded="true" signature="15070:15139" ph="SELECT ISNUL... MF_ARP" />
 
+                <marker date="1584523553858" expanded="true" signature="15408:15477" ph="SELECT ISNUL... MF_PSS" />
 
+                <marker date="1584523553858" expanded="true" signature="15879:15939" ph="SELECT COUNT... MF_VHID" />
 
+                <marker date="1584523553858" expanded="true" signature="16241:16303" ph="SELECT ISNUL... " />
 
+                <marker date="1584523553858" expanded="true" signature="17213:17270" ph="UPDATE MF_PS... " />
 
+                <marker date="1584523553858" expanded="true" signature="17368:17425" ph="UPDATE MF_PS... " />
 
+                <marker date="1584523553858" expanded="true" signature="17560:17698" ph="UPDATE MF_PS... " />
 
+                <marker date="1584523553858" expanded="true" signature="18533:18651" ph="UPDATE MF_AR... " />
 
+                <marker date="1584523553858" expanded="true" signature="19276:19503" ph="INSERT INTO MF_ARP... " />
 
+                <marker date="1584523553858" expanded="true" signature="20520:20658" ph="UPDATE MF_PS... " />
 
+                <marker date="1584523553858" expanded="true" signature="21266:21316" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="21505:21616" ph="UPDATE TF_PS... " />
 
+                <marker date="1584523553858" expanded="true" signature="23283:23340" ph="SELECT ZHANG... MF_PSS" />
 
+                <marker date="1584523553858" expanded="true" signature="23560:23629" ph="SELECT ISNUL... MF_ARP" />
 
+                <marker date="1584523553858" expanded="true" signature="23944:24013" ph="SELECT ISNUL... MF_PSS" />
 
+                <marker date="1584523553858" expanded="true" signature="24413:24462" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="24522:24571" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="24631:24682" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="29632:29692" ph="SELECT COUNT... MF_VHID" />
 
+                <marker date="1584523553858" expanded="true" signature="29994:30056" ph="SELECT ISNUL... " />
 
+                <marker date="1584523553858" expanded="true" signature="30947:31200" ph="INSERT INTO MF_PSS... " />
 
+                <marker date="1584523553858" expanded="true" signature="32331:32567" ph="INSERT INTO MF_ARP... " />
 
+                <marker date="1584523553858" expanded="true" signature="33495:33750" ph="INSERT INTO MF_PSS... " />
 
+                <marker date="1584523553858" expanded="true" signature="34811:35020" ph="INSERT INTO TF_PSS... " />
 
+                <marker date="1584523553858" expanded="true" signature="39465:39522" ph="SELECT ZHANG... MF_PSS" />
 
+                <marker date="1584523553858" expanded="true" signature="39783:39852" ph="SELECT ISNUL... MF_ARP" />
 
+                <marker date="1584523553858" expanded="true" signature="40167:40236" ph="SELECT ISNUL... MF_PSS" />
 
+                <marker date="1584523553858" expanded="true" signature="40688:40748" ph="SELECT COUNT... MF_VHID" />
 
+                <marker date="1584523553858" expanded="true" signature="41050:41112" ph="SELECT ISNUL... " />
 
+                <marker date="1584523553858" expanded="true" signature="42057:42195" ph="UPDATE MF_PS... " />
 
+                <marker date="1584523553858" expanded="true" signature="42910:43028" ph="UPDATE MF_AR... " />
 
+                <marker date="1584523553858" expanded="true" signature="43590:43821" ph="INSERT INTO MF_ARP... " />
 
+                <marker date="1584523553858" expanded="true" signature="44838:44976" ph="UPDATE MF_PS... " />
 
+                <marker date="1584523553858" expanded="true" signature="45584:45634" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="45844:45955" ph="UPDATE TF_PS... " />
 
+                <marker date="1584523553858" expanded="true" signature="47411:47468" ph="SELECT ZHANG... MF_PSS" />
 
+                <marker date="1584523553858" expanded="true" signature="47688:47757" ph="SELECT ISNUL... MF_ARP" />
 
+                <marker date="1584523553858" expanded="true" signature="48072:48141" ph="SELECT ISNUL... MF_PSS" />
 
+                <marker date="1584523553858" expanded="true" signature="48541:48590" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="48650:48699" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="48759:48810" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="53123:53183" ph="SELECT COUNT... MF_VHID" />
 
+                <marker date="1584523553858" expanded="true" signature="53499:53550" ph="SELECT ISNUL... BACC" />
 
+                <marker date="1584523553858" expanded="true" signature="54005:54299" ph="INSERT INTO TF_MON... " />
 
+                <marker date="1584523553858" expanded="true" signature="55803:56083" ph="INSERT INTO TF_MON... " />
 
+                <marker date="1584523553858" expanded="true" signature="56495:56630" ph="INSERT INTO MF_MON... " />
 
+                <marker date="1584523553858" expanded="true" signature="57059:57282" ph="INSERT INTO MF_BAC... " />
 
+                <marker date="1584523553858" expanded="true" signature="58137:58291" ph="INSERT INTO TF_BAC... " />
 
+                <marker date="1584523553858" expanded="true" signature="62961:63021" ph="SELECT COUNT... MF_VHID" />
 
+                <marker date="1584523553858" expanded="true" signature="63362:63413" ph="SELECT ISNUL... BACC" />
 
+                <marker date="1584523553858" expanded="true" signature="63889:64042" ph="UPDATE TF_MO... " />
 
+                <marker date="1584523553858" expanded="true" signature="64411:64565" ph="UPDATE TF_MO... " />
 
+                <marker date="1584523553858" expanded="true" signature="64830:64879" ph="UPDATE MF_MO... " />
 
+                <marker date="1584523553858" expanded="true" signature="65067:65154" ph="UPDATE MF_BA... " />
 
+                <marker date="1584523553858" expanded="true" signature="65431:65490" ph="UPDATE TF_BA... " />
 
+                <marker date="1584523553858" expanded="true" signature="67045:67092" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="67166:67214" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="67290:67323" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="67411:67444" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="67965:68044" ph="SELECT table... TABLES" />
 
+                <marker date="1584523553858" expanded="true" signature="68236:68267" ph="SELECT COUNT... MF_LZ1_Z01" />
 
+                <marker date="1584523553858" expanded="true" signature="68449:69004" ph="SELECT ISNUL... MF_LZ1_Z01" />
 
+                <marker date="1584523553858" expanded="true" signature="69814:69859" ph="UPDATE MF_LZ... " />
 
+                <marker date="1584523553858" expanded="true" signature="70194:70272" ph="SELECT table... TABLES" />
 
+                <marker date="1584523553858" expanded="true" signature="70464:70494" ph="SELECT COUNT... MF_LZ_Z01" />
 
+                <marker date="1584523553858" expanded="true" signature="70681:71234" ph="SELECT ISNUL... MF_LZ_Z01" />
 
+                <marker date="1584523553858" expanded="true" signature="72067:72111" ph="UPDATE MF_LZ... " />
 
+                <marker date="1584523553858" expanded="true" signature="72840:72918" ph="SELECT table... TABLES" />
 
+                <marker date="1584523553858" expanded="true" signature="73109:73139" ph="SELECT COUNT... TC_MON_PC" />
 
+                <marker date="1584523553858" expanded="true" signature="73326:73807" ph="SELECT ISNUL... TC_MON_PC" />
 
+                <marker date="1584523553858" expanded="true" signature="74394:74438" ph="UPDATE TC_MO... " />
 
+                <marker date="1584523553858" expanded="true" signature="75204:75282" ph="SELECT table... TABLES" />
 
+                <marker date="1584523553858" expanded="true" signature="75473:75503" ph="SELECT COUNT... TC_MON_PC" />
 
+                <marker date="1584523553858" expanded="true" signature="75690:76135" ph="SELECT ISNUL... TC_MON_PC" />
 
+                <marker date="1584523553858" expanded="true" signature="76742:76786" ph="UPDATE TC_MO... " />
 
+                <marker date="1584523553858" expanded="true" signature="77551:77629" ph="SELECT table... TABLES" />
 
+                <marker date="1584523553858" expanded="true" signature="77820:77850" ph="SELECT COUNT... TC_MON_PC" />
 
+                <marker date="1584523553858" expanded="true" signature="78037:78554" ph="SELECT ISNUL... TC_MON_PC" />
 
+                <marker date="1584523553858" expanded="true" signature="79161:79205" ph="UPDATE TC_MO... " />
 
+                <marker date="1584523553858" expanded="true" signature="79761:79793" ph="SELECT DEP,N... DEPT" />
 
+                <marker date="1584523553858" expanded="true" signature="79853:79887" ph="SELECT top 1... DEPT" />
 
+                <marker date="1584523553858" expanded="true" signature="80626:80661" ph="SELECT PRD_N... PRDT" />
 
+                <marker date="1584523553858" expanded="true" signature="80721:80757" ph="SELECT top 1... PRDT" />
 
+                <marker date="1584523553858" expanded="true" signature="81828:81864" ph="SELECT CUS_N... CUST" />
 
+                <marker date="1584523553858" expanded="true" signature="81924:81960" ph="SELECT top 1... CUST" />
 
+                <marker date="1584523553858" expanded="true" signature="83032:83069" ph="SELECT CUS_N... MF" />
 
+                <marker date="1584523553858" expanded="true" signature="83129:83167" ph="SELECT top 1... CUST" />
 
+                <marker date="1584523553858" expanded="true" signature="84251:84286" ph="SELECT NO,DE... " />
 
+                <marker date="1584523553858" expanded="true" signature="84346:84382" ph="SELECT top 2... " />
 
+                <marker date="1584523553858" expanded="true" signature="84346:84399" ph="SELECT top 2... " />
 
+                <marker date="1584523553858" expanded="true" signature="89467:89515" ph="SELECT COUNT... View_aa" />
 
+                <marker date="1584523553858" expanded="true" signature="90143:90726" ph="SELECT TOP m... " />
 
+                <marker date="1584523553858" expanded="true" signature="91945:92022" ph="SELECT COUNT... OS_NO" />
 
+                <marker date="1584523553858" expanded="true" signature="91980:92016" ph="SELECT OS_NO... View_aa" />
 
+                <marker date="1584523553858" expanded="true" signature="92809:93715" ph="SELECT TOP m... View_aa" />
 
+                <marker date="1584523553858" expanded="true" signature="95394:95475" ph="UPDATE TF_PO... " />
 
+                <marker date="1584523553858" expanded="true" signature="96728:97526" ph="SELECT itm,n... " />
 
+                <marker date="1584523553858" expanded="true" signature="96728:97529" ph="SELECT dep,d... MCAF" />
 
+                <marker date="1584523553858" expanded="true" signature="98261:98306" ph="SELECT MAX(N... " />
 
+                <marker date="1584523553858" expanded="true" signature="99929:100332" ph="INSERT INTO mcaf... " />
 
+                <marker date="1584523553858" expanded="true" signature="102899:103264" ph="UPDATE MCAF " />
 
+                <marker date="1584523553858" expanded="true" signature="102905:103264" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="104141:104192" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="104291:104342" ph="DELETE FROM " />
 
+                <marker date="1584523553858" expanded="true" signature="104706:105372" ph="SELECT b.dep... mf_mo" />
 
+                <marker date="1584523553858" expanded="true" signature="106245:106487" ph="SELECT isnul... DSCSETTING" />
 
+                <marker date="1584523553858" expanded="true" signature="106539:106724" ph="SELECT dep,d... DSCSETTING" />
 
+                <marker date="1584523553858" expanded="true" signature="109744:109831" ph="SELECT MAX(I... " />
 
+                <marker date="1584523553858" expanded="true" signature="110228:110458" ph="INSERT INTO MF_IEFILE... " />
 
+                <marker date="1584523553858" expanded="true" signature="110228:110685" ph="INSERT INTO MF_IEFILE... " />
 
+                <marker date="1584523553858" expanded="true" signature="110827:110896" ph="INSERT INTO TF_IEFILE_BOM... " />
 
+                <marker date="1584523553858" expanded="true" signature="111226:111299" ph="INSERT INTO TF_IEFILE_BOM... " />
 
               </folding>
 
             </state>
 
           </provider>
 
         </entry>
 
       </file>
 
-      <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="231">
 
-              <caret line="16" column="18" lean-forward="false" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="18" />
 
-              <folding />
 
-            </state>
 
-          </provider>
 
-        </entry>
 
-      </file>
 
-      <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
 
-        <entry file="file://$PROJECT_DIR$/meib/meib/apps/users/models.py">
 
+      <file leaf-file-name="lianxi.py" pinned="false" current-in-tab="false">
 
+        <entry file="file://$PROJECT_DIR$/meib/meib/apps/erp/lianxi.py">
 
           <provider selected="true" editor-type-id="text-editor">
 
-            <state relative-caret-position="366">
 
-              <caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="31" />
 
+            <state relative-caret-position="108">
 
+              <caret line="4" column="10" lean-forward="false" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
 
               <folding />
 
             </state>
 
           </provider>
 
         </entry>
 
       </file>
 
-      <file leaf-file-name="dev.py" pinned="false" current-in-tab="false">
 
-        <entry file="file://$PROJECT_DIR$/meib/meib/settings/dev.py">
 
+      <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="237">
 
-              <caret line="205" column="6" lean-forward="false" selection-start-line="205" selection-start-column="6" selection-end-line="205" selection-end-column="6" />
 
+            <state relative-caret-position="540">
 
+              <caret line="21" column="14" lean-forward="false" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="14" />
 
               <folding />
 
             </state>
 
           </provider>
 
@@ -219,7 +243,6 @@
 
   </component>
 
   <component name="FindInProjectRecents">
 
     <findStrings>
 
-      <find>awj</find>
 
       <find>templates</find>
 
       <find>setting</find>
 
       <find>static</find>
 
@@ -240,13 +263,16 @@
 
       <find>p_d_f_e_configurations</find>
 
       <find>work_sum</find>
 
       <find>zj_274_24</find>
 
-      <find>a_strength</find>
 
-      <find>p_gap</find>
 
       <find>指定</find>
 
       <find>SESSION</find>
 
       <find>pr</find>
 
       <find>类别</find>
 
       <find>errmsg</find>
 
+      <find>depmacfdepdata</find>
 
+      <find>[&quot;data&quot;]</find>
 
+      <find>p_gap</find>
 
+      <find>a_strength</find>
 
+      <find>sys_date</find>
 
     </findStrings>
 
     <replaceStrings>
 
       <replace>meib</replace>
 
@@ -276,7 +302,6 @@
 
         <option value="$PROJECT_DIR$/meib/meib/apps/tx/views.py" />
 
         <option value="$PROJECT_DIR$/meib/meib/utils/executeQuery.py" />
 
         <option value="$PROJECT_DIR$/meib/meib/utils/page.py" />
 
-        <option value="$PROJECT_DIR$/meib/meib/utils/monthly_odd.py" />
 
         <option value="$PROJECT_DIR$/meib/meib/settings/lianxi.py" />
 
         <option value="$PROJECT_DIR$/meib/meib/urls.py" />
 
         <option value="F:/python/03Django/02Django_上上项目/0524_day03/2_code/meiduo12/meiduo_mall/meiduo_mall/settings/dev.py" />
 
@@ -285,8 +310,9 @@
 
         <option value="$PROJECT_DIR$/meib/meib/utils/middleware.py" />
 
         <option value="$PROJECT_DIR$/meib/meib/settings/dev.py" />
 
         <option value="F:/python/03Django/02Django_上上项目/0524_day03/2_code/meiduo12/meiduo_mall/meiduo_mall/apps/users/views.py" />
 
-        <option value="$PROJECT_DIR$/meib/meib/apps/erp/lianxi.py" />
 
         <option value="$PROJECT_DIR$/meib/meib/apps/users/views.py" />
 
+        <option value="$PROJECT_DIR$/meib/meib/apps/erp/lianxi.py" />
 
+        <option value="$PROJECT_DIR$/meib/meib/utils/monthly_odd.py" />
 
         <option value="$PROJECT_DIR$/meib/meib/apps/erp/urls.py" />
 
         <option value="$PROJECT_DIR$/meib/meib/apps/erp/views.py" />
 
       </list>
 
@@ -319,6 +345,7 @@
 
       <foldersAlwaysOnTop value="true" />
 
     </navigator>
 
     <panes>
 
+      <pane id="Scratches" />
 
       <pane id="Scope" />
 
       <pane id="ProjectPane">
 
         <subPane>
 
@@ -436,7 +463,6 @@
 
           </PATH>
 
         </subPane>
 
       </pane>
 
-      <pane id="Scratches" />
 
     </panes>
 
   </component>
 
   <component name="PropertiesComponent">
 
@@ -465,7 +491,7 @@
 
       </list>
 
     </option>
 
   </component>
 
-  <component name="RunManager" selected="Python.lianxi">
 
+  <component name="RunManager" selected="Python.manage">
 
     <configuration default="false" name="manage" type="PythonConfigurationType" factoryName="Python" temporary="true">
 
       <option name="INTERPRETER_OPTIONS" value="" />
 
       <option name="PARENT_ENVS" value="true" />
 
@@ -866,19 +892,26 @@
 
       <option name="project" value="LOCAL" />
 
       <updated>1583766363544</updated>
 
     </task>
 
-    <option name="localTasksCounter" value="19" />
 
+    <task id="LOCAL-00019" summary="用户修改完成">
 
+      <created>1583919082122</created>
 
+      <option name="number" value="00019" />
 
+      <option name="presentableId" value="LOCAL-00019" />
 
+      <option name="project" value="LOCAL" />
 
+      <updated>1583919082122</updated>
 
+    </task>
 
+    <option name="localTasksCounter" value="20" />
 
     <servers />
 
   </component>
 
   <component name="ToolWindowManager">
 
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
 
     <layout>
 
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15991472" 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.10714286" 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.20390455" sideWeight="0.5021322" 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.35032538" sideWeight="0.4978678" 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="true" show_stripe_button="true" weight="0.3362256" sideWeight="0.4978678" 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="false" show_stripe_button="true" weight="0.22559653" 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" />
 
@@ -920,7 +953,8 @@
 
     <MESSAGE value="分页完成" />
 
     <MESSAGE value="分页完成ok" />
 
     <MESSAGE value="分页完成o" />
 
-    <option name="LAST_COMMIT_MESSAGE" value="分页完成o" />
 
+    <MESSAGE value="用户修改完成" />
 
+    <option name="LAST_COMMIT_MESSAGE" value="用户修改完成" />
 
   </component>
 
   <component name="XDebuggerManager">
 
     <breakpoint-manager>
 
@@ -929,34 +963,6 @@
 
     <watches-manager />
 
   </component>
 
   <component name="editorHistoryManager">
 
-    <entry file="file://F:/python/03Django/02Django_上上项目/0610_day14/2_code/meiduo12/meiduo_mall/meiduo_mall/templates/user_center_info.html">
 
-      <provider selected="true" editor-type-id="text-editor">
 
-        <state relative-caret-position="216">
 
-          <caret line="8" column="4" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="69" />
 
-        </state>
 
-      </provider>
 
-    </entry>
 
-    <entry file="file://$PROJECT_DIR$/meib/meib/static/css/main.css">
 
-      <provider selected="true" editor-type-id="text-editor">
 
-        <state relative-caret-position="-2940">
 
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
 
-        </state>
 
-      </provider>
 
-    </entry>
 
-    <entry file="file://$PROJECT_DIR$/meib/meib/static/js/jquery.min.js">
 
-      <provider selected="true" editor-type-id="text-editor">
 
-        <state relative-caret-position="108">
 
-          <caret line="4" column="35" lean-forward="false" selection-start-line="4" selection-start-column="35" selection-end-line="4" selection-end-column="35" />
 
-        </state>
 
-      </provider>
 
-    </entry>
 
-    <entry file="file://$PROJECT_DIR$/meib/meib/static/js/bootstrap.min.js">
 
-      <provider selected="true" editor-type-id="text-editor">
 
-        <state relative-caret-position="162">
 
-          <caret line="6" column="4886" lean-forward="false" selection-start-line="6" selection-start-column="4886" selection-end-line="6" selection-end-column="4886" />
 
-        </state>
 
-      </provider>
 
-    </entry>
 
     <entry file="file://$PROJECT_DIR$/meib/meib/static/js/vue-2.4.0.js">
 
       <provider selected="true" editor-type-id="text-editor">
 
         <state relative-caret-position="0">
 
@@ -1107,20 +1113,6 @@
 
         </state>
 
       </provider>
 
     </entry>
 
-    <entry file="file://$PROJECT_DIR$/meib/meib/utils/executeQuery.py">
 
-      <provider selected="true" editor-type-id="text-editor">
 
-        <state relative-caret-position="243">
 
-          <caret line="15" column="8" lean-forward="true" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="53" />
 
-        </state>
 
-      </provider>
 
-    </entry>
 
-    <entry file="file://$PROJECT_DIR$/meib/meib/utils/monthly_odd.py">
 
-      <provider selected="true" editor-type-id="text-editor">
 
-        <state relative-caret-position="567">
 
-          <caret line="21" column="27" lean-forward="true" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" />
 
-        </state>
 
-      </provider>
 
-    </entry>
 
     <entry file="file://$PROJECT_DIR$/meib/meib/apps/tx/views.py">
 
       <provider selected="true" editor-type-id="text-editor">
 
         <state relative-caret-position="216">
 
@@ -1199,22 +1191,10 @@
 
         </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="237">
 
-          <caret line="205" column="6" lean-forward="false" selection-start-line="205" selection-start-column="6" selection-end-line="205" selection-end-column="6" />
 
-          <folding />
 
-        </state>
 
-      </provider>
 
-    </entry>
 
     <entry file="file://F:/python/03Django/02Django_上上项目/0524_day03/2_code/meiduo12/meiduo_mall/meiduo_mall/apps/users/views.py">
 
       <provider selected="true" editor-type-id="text-editor">
 
         <state relative-caret-position="456">
 
           <caret line="117" column="0" lean-forward="true" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" />
 
-          <folding>
 
-            <element signature="e#0#44#0" expanded="false" />
 
-            <element signature="e#2316#3402#0" expanded="false" />
 
-          </folding>
 
         </state>
 
       </provider>
 
     </entry>
 
@@ -1222,17 +1202,6 @@
 
       <provider selected="true" editor-type-id="text-editor">
 
         <state relative-caret-position="189">
 
           <caret line="51" column="46" lean-forward="false" selection-start-line="51" selection-start-column="46" selection-end-line="51" selection-end-column="46" />
 
-          <folding>
 
-            <element signature="e#38#65#0" expanded="false" />
 
-          </folding>
 
-        </state>
 
-      </provider>
 
-    </entry>
 
-    <entry file="file://$PROJECT_DIR$/meib/meib/apps/users/models.py">
 
-      <provider selected="true" editor-type-id="text-editor">
 
-        <state relative-caret-position="366">
 
-          <caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="31" />
 
-          <folding />
 
         </state>
 
       </provider>
 
     </entry>
 
@@ -1240,7 +1209,6 @@
 
       <provider selected="true" editor-type-id="text-editor">
 
         <state relative-caret-position="121">
 
           <caret line="2029" column="8" lean-forward="false" selection-start-line="2029" selection-start-column="8" selection-end-line="2029" selection-end-column="8" />
 
-          <folding />
 
         </state>
 
       </provider>
 
     </entry>
 
@@ -1248,15 +1216,6 @@
 
       <provider selected="true" editor-type-id="text-editor">
 
         <state relative-caret-position="139">
 
           <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
 
-          <folding>
 
-            <element signature="e#818#1231#0" expanded="false" />
 
-            <element signature="e#1264#4188#0" expanded="false" />
 
-            <element signature="e#3915#4188#0" expanded="false" />
 
-            <element signature="e#4245#4382#0" expanded="false" />
 
-            <element signature="e#4459#5588#0" expanded="false" />
 
-            <marker date="1583914800396" expanded="true" signature="4754:4786" ph="SELECT USR,N... PSWD" />
 
-            <marker date="1583914800396" expanded="true" signature="4846:4871" ph="SELECT USR,N... PSWD" />
 
-          </folding>
 
         </state>
 
       </provider>
 
     </entry>
 
@@ -1264,30 +1223,85 @@
 
       <provider selected="true" editor-type-id="text-editor">
 
         <state relative-caret-position="189">
 
           <caret line="8" column="1" lean-forward="true" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
 
-          <folding />
 
+        </state>
 
+      </provider>
 
+    </entry>
 
+    <entry file="file://$PROJECT_DIR$/meib/meib/apps/users/models.py">
 
+      <provider selected="true" editor-type-id="text-editor">
 
+        <state relative-caret-position="486">
 
+          <caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="31" />
 
+        </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="803">
 
+          <caret line="205" column="6" lean-forward="false" selection-start-line="205" selection-start-column="6" selection-end-line="205" selection-end-column="6" />
 
+        </state>
 
+      </provider>
 
+    </entry>
 
+    <entry file="file://$USER_HOME$/.PyCharm2017.1/system/python_stubs/2013682045/_sqlite3.py">
 
+      <provider selected="true" editor-type-id="text-editor">
 
+        <state relative-caret-position="503">
 
+          <caret line="169" column="15" lean-forward="false" selection-start-line="169" selection-start-column="8" selection-end-line="169" selection-end-column="15" />
 
+        </state>
 
+      </provider>
 
+    </entry>
 
+    <entry file="file://F:/python/02就业班第一册/02_python高级/0505-Python高级-第12天{Mysql}/code/04-防止sql注入.py">
 
+      <provider selected="true" editor-type-id="text-editor">
 
+        <state relative-caret-position="810">
 
+          <caret line="30" column="6" lean-forward="true" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
 
+        </state>
 
+      </provider>
 
+    </entry>
 
+    <entry file="file://$USER_HOME$/Envs/meibang/Lib/site-packages/django/db/backends/sqlite3/base.py">
 
+      <provider selected="true" editor-type-id="text-editor">
 
+        <state relative-caret-position="260">
 
+          <caret line="378" column="42" lean-forward="true" selection-start-line="378" selection-start-column="42" selection-end-line="378" selection-end-column="42" />
 
+        </state>
 
+      </provider>
 
+    </entry>
 
+    <entry file="file://F:/python/02就业班第一册/02_python高级/0505-Python高级-第12天{Mysql}/code/03-使用pymysql连接数据库做增删改操作.py">
 
+      <provider selected="true" editor-type-id="text-editor">
 
+        <state relative-caret-position="27">
 
+          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
 
+        </state>
 
+      </provider>
 
+    </entry>
 
+    <entry file="file://$PROJECT_DIR$/meib/meib/utils/executeQuery.py">
 
+      <provider selected="true" editor-type-id="text-editor">
 
+        <state relative-caret-position="378">
 
+          <caret line="14" column="39" lean-forward="false" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
 
+        </state>
 
+      </provider>
 
+    </entry>
 
+    <entry file="file://$PROJECT_DIR$/meib/meib/utils/monthly_odd.py">
 
+      <provider selected="true" editor-type-id="text-editor">
 
+        <state relative-caret-position="297">
 
+          <caret line="13" column="14" lean-forward="true" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
 
         </state>
 
       </provider>
 
     </entry>
 
     <entry file="file://$PROJECT_DIR$/meib/meib/apps/erp/lianxi.py">
 
       <provider selected="true" editor-type-id="text-editor">
 
-        <state relative-caret-position="189">
 
-          <caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="21" />
 
+        <state relative-caret-position="108">
 
+          <caret line="4" column="10" lean-forward="false" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
 
           <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="231">
 
-          <caret line="16" column="18" lean-forward="false" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="18" />
 
+        <state relative-caret-position="540">
 
+          <caret line="21" column="14" lean-forward="false" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="14" />
 
           <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="273">
 
-          <caret line="1961" column="36" lean-forward="true" selection-start-line="1961" selection-start-column="36" selection-end-line="1961" selection-end-column="36" />
 
+        <state relative-caret-position="243">
 
+          <caret line="2315" column="23" lean-forward="true" selection-start-line="2315" selection-start-column="23" selection-end-line="2315" selection-end-column="23" />
 
           <folding>
 
             <element signature="e#0#35#0" expanded="true" />
 
             <element signature="e#697#731#0" expanded="false" />
 
@@ -1297,124 +1311,158 @@
 
             <element signature="e#25141#25299#0" expanded="false" />
 
             <element signature="e#25362#36221#0" expanded="false" />
 
             <element signature="e#36283#46612#0" expanded="false" />
 
-            <element signature="e#46677#49180#0" expanded="false" />
 
+            <element signature="e#47350#48339#0" expanded="false" />
 
             <element signature="e#49216#67801#0" expanded="false" />
 
             <element signature="e#67835#70030#0" expanded="false" />
 
             <element signature="e#70064#72308#0" expanded="false" />
 
             <element signature="e#72308#72316#0" expanded="false" />
 
             <element signature="e#72710#74637#0" expanded="false" />
 
             <element signature="e#75074#76983#0" expanded="false" />
 
-            <element signature="e#77421#79402#0" expanded="false" />
 
-            <element signature="e#79586#89282#0" expanded="false" />
 
-            <element signature="e#90944#93494#0" expanded="false" />
 
-            <element signature="e#93766#94322#0" expanded="false" />
 
-            <element signature="e#94384#95492#0" expanded="false" />
 
-            <element signature="e#95556#96692#0" expanded="false" />
 
-            <element signature="e#95633#95914#0" expanded="false" />
 
-            <element signature="e#96755#96987#0" expanded="false" />
 
-            <element signature="e#97994#98297#0" expanded="false" />
 
-            <marker date="1583918384697" expanded="true" signature="4597:4657" ph="SELECT COUNT... MF_VHID" />
 
-            <marker date="1583918384697" expanded="true" signature="4959:5021" ph="SELECT ISNUL... " />
 
-            <marker date="1583918384697" expanded="true" signature="5886:6116" ph="INSERT INTO MF_PSS... " />
 
-            <marker date="1583918384697" expanded="true" signature="7094:7147" ph="INSERT INTO MF_PSS_Z... " />
 
-            <marker date="1583918384697" expanded="true" signature="7284:7516" ph="INSERT INTO MF_ARP... " />
 
-            <marker date="1583918384697" expanded="true" signature="8443:8675" ph="INSERT INTO MF_PSS... " />
 
-            <marker date="1583918384697" expanded="true" signature="9617:9822" ph="INSERT INTO TF_PSS... " />
 
-            <marker date="1583918384697" expanded="true" signature="14842:14899" ph="SELECT ZHANG... MF_PSS" />
 
-            <marker date="1583918384697" expanded="true" signature="15070:15139" ph="SELECT ISNUL... MF_ARP" />
 
-            <marker date="1583918384697" expanded="true" signature="15408:15477" ph="SELECT ISNUL... MF_PSS" />
 
-            <marker date="1583918384697" expanded="true" signature="15879:15939" ph="SELECT COUNT... MF_VHID" />
 
-            <marker date="1583918384697" expanded="true" signature="16241:16303" ph="SELECT ISNUL... " />
 
-            <marker date="1583918384697" expanded="true" signature="17213:17270" ph="UPDATE MF_PS... " />
 
-            <marker date="1583918384697" expanded="true" signature="17368:17425" ph="UPDATE MF_PS... " />
 
-            <marker date="1583918384697" expanded="true" signature="17560:17698" ph="UPDATE MF_PS... " />
 
-            <marker date="1583918384697" expanded="true" signature="18533:18651" ph="UPDATE MF_AR... " />
 
-            <marker date="1583918384697" expanded="true" signature="19276:19503" ph="INSERT INTO MF_ARP... " />
 
-            <marker date="1583918384697" expanded="true" signature="20520:20658" ph="UPDATE MF_PS... " />
 
-            <marker date="1583918384697" expanded="true" signature="21266:21316" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="21505:21616" ph="UPDATE TF_PS... " />
 
-            <marker date="1583918384697" expanded="true" signature="23283:23340" ph="SELECT ZHANG... MF_PSS" />
 
-            <marker date="1583918384697" expanded="true" signature="23560:23629" ph="SELECT ISNUL... MF_ARP" />
 
-            <marker date="1583918384697" expanded="true" signature="23944:24013" ph="SELECT ISNUL... MF_PSS" />
 
-            <marker date="1583918384697" expanded="true" signature="24413:24462" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="24522:24571" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="24631:24682" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="29632:29692" ph="SELECT COUNT... MF_VHID" />
 
-            <marker date="1583918384697" expanded="true" signature="29994:30056" ph="SELECT ISNUL... " />
 
-            <marker date="1583918384697" expanded="true" signature="30947:31200" ph="INSERT INTO MF_PSS... " />
 
-            <marker date="1583918384697" expanded="true" signature="32331:32567" ph="INSERT INTO MF_ARP... " />
 
-            <marker date="1583918384697" expanded="true" signature="33495:33750" ph="INSERT INTO MF_PSS... " />
 
-            <marker date="1583918384697" expanded="true" signature="34811:35020" ph="INSERT INTO TF_PSS... " />
 
-            <marker date="1583918384697" expanded="true" signature="39465:39522" ph="SELECT ZHANG... MF_PSS" />
 
-            <marker date="1583918384697" expanded="true" signature="39783:39852" ph="SELECT ISNUL... MF_ARP" />
 
-            <marker date="1583918384697" expanded="true" signature="40167:40236" ph="SELECT ISNUL... MF_PSS" />
 
-            <marker date="1583918384697" expanded="true" signature="40688:40748" ph="SELECT COUNT... MF_VHID" />
 
-            <marker date="1583918384697" expanded="true" signature="41050:41112" ph="SELECT ISNUL... " />
 
-            <marker date="1583918384697" expanded="true" signature="42057:42195" ph="UPDATE MF_PS... " />
 
-            <marker date="1583918384697" expanded="true" signature="42910:43028" ph="UPDATE MF_AR... " />
 
-            <marker date="1583918384697" expanded="true" signature="43590:43821" ph="INSERT INTO MF_ARP... " />
 
-            <marker date="1583918384697" expanded="true" signature="44838:44976" ph="UPDATE MF_PS... " />
 
-            <marker date="1583918384697" expanded="true" signature="45584:45634" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="45844:45955" ph="UPDATE TF_PS... " />
 
-            <marker date="1583918384697" expanded="true" signature="47411:47468" ph="SELECT ZHANG... MF_PSS" />
 
-            <marker date="1583918384697" expanded="true" signature="47688:47757" ph="SELECT ISNUL... MF_ARP" />
 
-            <marker date="1583918384697" expanded="true" signature="48072:48141" ph="SELECT ISNUL... MF_PSS" />
 
-            <marker date="1583918384697" expanded="true" signature="48541:48590" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="48650:48699" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="48759:48810" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="53123:53183" ph="SELECT COUNT... MF_VHID" />
 
-            <marker date="1583918384697" expanded="true" signature="53499:53550" ph="SELECT ISNUL... BACC" />
 
-            <marker date="1583918384697" expanded="true" signature="54005:54299" ph="INSERT INTO TF_MON... " />
 
-            <marker date="1583918384697" expanded="true" signature="55803:56083" ph="INSERT INTO TF_MON... " />
 
-            <marker date="1583918384697" expanded="true" signature="56495:56630" ph="INSERT INTO MF_MON... " />
 
-            <marker date="1583918384697" expanded="true" signature="57059:57282" ph="INSERT INTO MF_BAC... " />
 
-            <marker date="1583918384697" expanded="true" signature="58137:58291" ph="INSERT INTO TF_BAC... " />
 
-            <marker date="1583918384697" expanded="true" signature="62961:63021" ph="SELECT COUNT... MF_VHID" />
 
-            <marker date="1583918384697" expanded="true" signature="63362:63413" ph="SELECT ISNUL... BACC" />
 
-            <marker date="1583918384697" expanded="true" signature="63889:64042" ph="UPDATE TF_MO... " />
 
-            <marker date="1583918384697" expanded="true" signature="64411:64565" ph="UPDATE TF_MO... " />
 
-            <marker date="1583918384697" expanded="true" signature="64830:64879" ph="UPDATE MF_MO... " />
 
-            <marker date="1583918384697" expanded="true" signature="65067:65154" ph="UPDATE MF_BA... " />
 
-            <marker date="1583918384697" expanded="true" signature="65431:65490" ph="UPDATE TF_BA... " />
 
-            <marker date="1583918384697" expanded="true" signature="67045:67092" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="67166:67214" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="67290:67323" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="67411:67444" ph="DELETE FROM " />
 
-            <marker date="1583918384697" expanded="true" signature="67965:68044" ph="SELECT table... TABLES" />
 
-            <marker date="1583918384697" expanded="true" signature="68236:68267" ph="SELECT COUNT... MF_LZ1_Z01" />
 
-            <marker date="1583918384697" expanded="true" signature="68449:69004" ph="SELECT ISNUL... MF_LZ1_Z01" />
 
-            <marker date="1583918384697" expanded="true" signature="69814:69859" ph="UPDATE MF_LZ... " />
 
-            <marker date="1583918384697" expanded="true" signature="70194:70272" ph="SELECT table... TABLES" />
 
-            <marker date="1583918384697" expanded="true" signature="70464:70494" ph="SELECT COUNT... MF_LZ_Z01" />
 
-            <marker date="1583918384697" expanded="true" signature="70681:71234" ph="SELECT ISNUL... MF_LZ_Z01" />
 
-            <marker date="1583918384697" expanded="true" signature="72067:72111" ph="UPDATE MF_LZ... " />
 
-            <marker date="1583918384697" expanded="true" signature="72840:72918" ph="SELECT table... TABLES" />
 
-            <marker date="1583918384697" expanded="true" signature="73109:73139" ph="SELECT COUNT... TC_MON_PC" />
 
-            <marker date="1583918384697" expanded="true" signature="73326:73807" ph="SELECT ISNUL... TC_MON_PC" />
 
-            <marker date="1583918384697" expanded="true" signature="74394:74438" ph="UPDATE TC_MO... " />
 
-            <marker date="1583918384697" expanded="true" signature="75204:75282" ph="SELECT table... TABLES" />
 
-            <marker date="1583918384697" expanded="true" signature="75473:75503" ph="SELECT COUNT... TC_MON_PC" />
 
-            <marker date="1583918384697" expanded="true" signature="75690:76135" ph="SELECT ISNUL... TC_MON_PC" />
 
-            <marker date="1583918384697" expanded="true" signature="76742:76786" ph="UPDATE TC_MO... " />
 
-            <marker date="1583918384697" expanded="true" signature="77551:77629" ph="SELECT table... TABLES" />
 
-            <marker date="1583918384697" expanded="true" signature="77820:77850" ph="SELECT COUNT... TC_MON_PC" />
 
-            <marker date="1583918384697" expanded="true" signature="78037:78554" ph="SELECT ISNUL... TC_MON_PC" />
 
-            <marker date="1583918384697" expanded="true" signature="79161:79205" ph="UPDATE TC_MO... " />
 
-            <marker date="1583918384697" expanded="true" signature="84007:84055" ph="SELECT COUNT... View_aa" />
 
-            <marker date="1583918384697" expanded="true" signature="84683:85266" ph="SELECT TOP m... " />
 
-            <marker date="1583918384697" expanded="true" signature="86485:86562" ph="SELECT COUNT... OS_NO" />
 
-            <marker date="1583918384697" expanded="true" signature="86520:86556" ph="SELECT OS_NO... View_aa" />
 
-            <marker date="1583918384697" expanded="true" signature="87349:88255" ph="SELECT TOP m... View_aa" />
 
-            <marker date="1583918384697" expanded="true" signature="89838:89919" ph="UPDATE TF_PO... " />
 
-            <marker date="1583918384697" expanded="true" signature="90993:91038" ph="SELECT MAX(N... " />
 
-            <marker date="1583918384697" expanded="true" signature="92633:93036" ph="INSERT INTO mcaf... " />
 
-            <marker date="1583918384697" expanded="true" signature="93843:93894" ph="SELECT DEP,N... DEPT" />
 
-            <marker date="1583918384697" expanded="true" signature="94659:94694" ph="SELECT PRD_N... PRDT" />
 
-            <marker date="1583918384697" expanded="true" signature="94754:94790" ph="SELECT top 1... PRDT" />
 
-            <marker date="1583918384697" expanded="true" signature="95854:95890" ph="SELECT CUS_N... CUST" />
 
-            <marker date="1583918384697" expanded="true" signature="95950:95986" ph="SELECT top 1... CUST" />
 
-            <marker date="1583918384697" expanded="true" signature="96763:96792" ph="SELECT TOP 5... MF_MO" />
 
-            <marker date="1583918384697" expanded="false" signature="97133:97721" ph="SELECT b.dep... mf_mo" />
 
+            <element signature="e#77421#79403#0" expanded="false" />
 
+            <element signature="e#79466#80264#0" expanded="false" />
 
+            <element signature="e#79543#79817#0" expanded="false" />
 
+            <element signature="e#80328#81466#0" expanded="false" />
 
+            <element signature="e#81530#82669#0" expanded="false" />
 
+            <element signature="e#82734#83873#0" expanded="false" />
 
+            <element signature="e#83265#83565#0" expanded="false" />
 
+            <element signature="e#83936#84820#0" expanded="false" />
 
+            <element signature="e#84868#84937#0" expanded="false" />
 
+            <element signature="e#85005#94742#0" expanded="false" />
 
+            <element signature="e#94779#95650#0" expanded="false" />
 
+            <element signature="e#95730#95767#0" expanded="false" />
 
+            <element signature="e#95836#97860#0" expanded="false" />
 
+            <element signature="e#96565#96583#0" expanded="false" />
 
+            <element signature="e#101063#103718#0" expanded="false" />
 
+            <element signature="e#101252#103591#0" expanded="false" />
 
+            <element signature="e#103757#104504#0" expanded="false" />
 
+            <element signature="e#104587#105573#0" expanded="false" />
 
+            <element signature="e#105645#105948#0" expanded="false" />
 
+            <element signature="e#105993#106065#0" expanded="false" />
 
+            <element signature="e#106142#107442#0" expanded="false" />
 
+            <element signature="e#107478#108233#0" expanded="false" />
 
+            <element signature="e#108305#108341#0" expanded="false" />
 
+            <element signature="e#108411#108530#0" expanded="false" />
 
+            <element signature="e#108421#108488#0" expanded="false" />
 
+            <marker date="1584523553858" expanded="true" signature="4597:4657" ph="SELECT COUNT... MF_VHID" />
 
+            <marker date="1584523553858" expanded="true" signature="4959:5021" ph="SELECT ISNUL... " />
 
+            <marker date="1584523553858" expanded="true" signature="5886:6116" ph="INSERT INTO MF_PSS... " />
 
+            <marker date="1584523553858" expanded="true" signature="7094:7147" ph="INSERT INTO MF_PSS_Z... " />
 
+            <marker date="1584523553858" expanded="true" signature="7284:7516" ph="INSERT INTO MF_ARP... " />
 
+            <marker date="1584523553858" expanded="true" signature="8443:8675" ph="INSERT INTO MF_PSS... " />
 
+            <marker date="1584523553858" expanded="true" signature="9617:9822" ph="INSERT INTO TF_PSS... " />
 
+            <marker date="1584523553858" expanded="true" signature="14842:14899" ph="SELECT ZHANG... MF_PSS" />
 
+            <marker date="1584523553858" expanded="true" signature="15070:15139" ph="SELECT ISNUL... MF_ARP" />
 
+            <marker date="1584523553858" expanded="true" signature="15408:15477" ph="SELECT ISNUL... MF_PSS" />
 
+            <marker date="1584523553858" expanded="true" signature="15879:15939" ph="SELECT COUNT... MF_VHID" />
 
+            <marker date="1584523553858" expanded="true" signature="16241:16303" ph="SELECT ISNUL... " />
 
+            <marker date="1584523553858" expanded="true" signature="17213:17270" ph="UPDATE MF_PS... " />
 
+            <marker date="1584523553858" expanded="true" signature="17368:17425" ph="UPDATE MF_PS... " />
 
+            <marker date="1584523553858" expanded="true" signature="17560:17698" ph="UPDATE MF_PS... " />
 
+            <marker date="1584523553858" expanded="true" signature="18533:18651" ph="UPDATE MF_AR... " />
 
+            <marker date="1584523553858" expanded="true" signature="19276:19503" ph="INSERT INTO MF_ARP... " />
 
+            <marker date="1584523553858" expanded="true" signature="20520:20658" ph="UPDATE MF_PS... " />
 
+            <marker date="1584523553858" expanded="true" signature="21266:21316" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="21505:21616" ph="UPDATE TF_PS... " />
 
+            <marker date="1584523553858" expanded="true" signature="23283:23340" ph="SELECT ZHANG... MF_PSS" />
 
+            <marker date="1584523553858" expanded="true" signature="23560:23629" ph="SELECT ISNUL... MF_ARP" />
 
+            <marker date="1584523553858" expanded="true" signature="23944:24013" ph="SELECT ISNUL... MF_PSS" />
 
+            <marker date="1584523553858" expanded="true" signature="24413:24462" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="24522:24571" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="24631:24682" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="29632:29692" ph="SELECT COUNT... MF_VHID" />
 
+            <marker date="1584523553858" expanded="true" signature="29994:30056" ph="SELECT ISNUL... " />
 
+            <marker date="1584523553858" expanded="true" signature="30947:31200" ph="INSERT INTO MF_PSS... " />
 
+            <marker date="1584523553858" expanded="true" signature="32331:32567" ph="INSERT INTO MF_ARP... " />
 
+            <marker date="1584523553858" expanded="true" signature="33495:33750" ph="INSERT INTO MF_PSS... " />
 
+            <marker date="1584523553858" expanded="true" signature="34811:35020" ph="INSERT INTO TF_PSS... " />
 
+            <marker date="1584523553858" expanded="true" signature="39465:39522" ph="SELECT ZHANG... MF_PSS" />
 
+            <marker date="1584523553858" expanded="true" signature="39783:39852" ph="SELECT ISNUL... MF_ARP" />
 
+            <marker date="1584523553858" expanded="true" signature="40167:40236" ph="SELECT ISNUL... MF_PSS" />
 
+            <marker date="1584523553858" expanded="true" signature="40688:40748" ph="SELECT COUNT... MF_VHID" />
 
+            <marker date="1584523553858" expanded="true" signature="41050:41112" ph="SELECT ISNUL... " />
 
+            <marker date="1584523553858" expanded="true" signature="42057:42195" ph="UPDATE MF_PS... " />
 
+            <marker date="1584523553858" expanded="true" signature="42910:43028" ph="UPDATE MF_AR... " />
 
+            <marker date="1584523553858" expanded="true" signature="43590:43821" ph="INSERT INTO MF_ARP... " />
 
+            <marker date="1584523553858" expanded="true" signature="44838:44976" ph="UPDATE MF_PS... " />
 
+            <marker date="1584523553858" expanded="true" signature="45584:45634" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="45844:45955" ph="UPDATE TF_PS... " />
 
+            <marker date="1584523553858" expanded="true" signature="47411:47468" ph="SELECT ZHANG... MF_PSS" />
 
+            <marker date="1584523553858" expanded="true" signature="47688:47757" ph="SELECT ISNUL... MF_ARP" />
 
+            <marker date="1584523553858" expanded="true" signature="48072:48141" ph="SELECT ISNUL... MF_PSS" />
 
+            <marker date="1584523553858" expanded="true" signature="48541:48590" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="48650:48699" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="48759:48810" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="53123:53183" ph="SELECT COUNT... MF_VHID" />
 
+            <marker date="1584523553858" expanded="true" signature="53499:53550" ph="SELECT ISNUL... BACC" />
 
+            <marker date="1584523553858" expanded="true" signature="54005:54299" ph="INSERT INTO TF_MON... " />
 
+            <marker date="1584523553858" expanded="true" signature="55803:56083" ph="INSERT INTO TF_MON... " />
 
+            <marker date="1584523553858" expanded="true" signature="56495:56630" ph="INSERT INTO MF_MON... " />
 
+            <marker date="1584523553858" expanded="true" signature="57059:57282" ph="INSERT INTO MF_BAC... " />
 
+            <marker date="1584523553858" expanded="true" signature="58137:58291" ph="INSERT INTO TF_BAC... " />
 
+            <marker date="1584523553858" expanded="true" signature="62961:63021" ph="SELECT COUNT... MF_VHID" />
 
+            <marker date="1584523553858" expanded="true" signature="63362:63413" ph="SELECT ISNUL... BACC" />
 
+            <marker date="1584523553858" expanded="true" signature="63889:64042" ph="UPDATE TF_MO... " />
 
+            <marker date="1584523553858" expanded="true" signature="64411:64565" ph="UPDATE TF_MO... " />
 
+            <marker date="1584523553858" expanded="true" signature="64830:64879" ph="UPDATE MF_MO... " />
 
+            <marker date="1584523553858" expanded="true" signature="65067:65154" ph="UPDATE MF_BA... " />
 
+            <marker date="1584523553858" expanded="true" signature="65431:65490" ph="UPDATE TF_BA... " />
 
+            <marker date="1584523553858" expanded="true" signature="67045:67092" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="67166:67214" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="67290:67323" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="67411:67444" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="67965:68044" ph="SELECT table... TABLES" />
 
+            <marker date="1584523553858" expanded="true" signature="68236:68267" ph="SELECT COUNT... MF_LZ1_Z01" />
 
+            <marker date="1584523553858" expanded="true" signature="68449:69004" ph="SELECT ISNUL... MF_LZ1_Z01" />
 
+            <marker date="1584523553858" expanded="true" signature="69814:69859" ph="UPDATE MF_LZ... " />
 
+            <marker date="1584523553858" expanded="true" signature="70194:70272" ph="SELECT table... TABLES" />
 
+            <marker date="1584523553858" expanded="true" signature="70464:70494" ph="SELECT COUNT... MF_LZ_Z01" />
 
+            <marker date="1584523553858" expanded="true" signature="70681:71234" ph="SELECT ISNUL... MF_LZ_Z01" />
 
+            <marker date="1584523553858" expanded="true" signature="72067:72111" ph="UPDATE MF_LZ... " />
 
+            <marker date="1584523553858" expanded="true" signature="72840:72918" ph="SELECT table... TABLES" />
 
+            <marker date="1584523553858" expanded="true" signature="73109:73139" ph="SELECT COUNT... TC_MON_PC" />
 
+            <marker date="1584523553858" expanded="true" signature="73326:73807" ph="SELECT ISNUL... TC_MON_PC" />
 
+            <marker date="1584523553858" expanded="true" signature="74394:74438" ph="UPDATE TC_MO... " />
 
+            <marker date="1584523553858" expanded="true" signature="75204:75282" ph="SELECT table... TABLES" />
 
+            <marker date="1584523553858" expanded="true" signature="75473:75503" ph="SELECT COUNT... TC_MON_PC" />
 
+            <marker date="1584523553858" expanded="true" signature="75690:76135" ph="SELECT ISNUL... TC_MON_PC" />
 
+            <marker date="1584523553858" expanded="true" signature="76742:76786" ph="UPDATE TC_MO... " />
 
+            <marker date="1584523553858" expanded="true" signature="77551:77629" ph="SELECT table... TABLES" />
 
+            <marker date="1584523553858" expanded="true" signature="77820:77850" ph="SELECT COUNT... TC_MON_PC" />
 
+            <marker date="1584523553858" expanded="true" signature="78037:78554" ph="SELECT ISNUL... TC_MON_PC" />
 
+            <marker date="1584523553858" expanded="true" signature="79161:79205" ph="UPDATE TC_MO... " />
 
+            <marker date="1584523553858" expanded="true" signature="79761:79793" ph="SELECT DEP,N... DEPT" />
 
+            <marker date="1584523553858" expanded="true" signature="79853:79887" ph="SELECT top 1... DEPT" />
 
+            <marker date="1584523553858" expanded="true" signature="80626:80661" ph="SELECT PRD_N... PRDT" />
 
+            <marker date="1584523553858" expanded="true" signature="80721:80757" ph="SELECT top 1... PRDT" />
 
+            <marker date="1584523553858" expanded="true" signature="81828:81864" ph="SELECT CUS_N... CUST" />
 
+            <marker date="1584523553858" expanded="true" signature="81924:81960" ph="SELECT top 1... CUST" />
 
+            <marker date="1584523553858" expanded="true" signature="83032:83069" ph="SELECT CUS_N... MF" />
 
+            <marker date="1584523553858" expanded="true" signature="83129:83167" ph="SELECT top 1... CUST" />
 
+            <marker date="1584523553858" expanded="true" signature="84251:84286" ph="SELECT NO,DE... " />
 
+            <marker date="1584523553858" expanded="true" signature="84346:84382" ph="SELECT top 2... " />
 
+            <marker date="1584523553858" expanded="true" signature="84346:84399" ph="SELECT top 2... " />
 
+            <marker date="1584523553858" expanded="true" signature="89467:89515" ph="SELECT COUNT... View_aa" />
 
+            <marker date="1584523553858" expanded="true" signature="90143:90726" ph="SELECT TOP m... " />
 
+            <marker date="1584523553858" expanded="true" signature="91945:92022" ph="SELECT COUNT... OS_NO" />
 
+            <marker date="1584523553858" expanded="true" signature="91980:92016" ph="SELECT OS_NO... View_aa" />
 
+            <marker date="1584523553858" expanded="true" signature="92809:93715" ph="SELECT TOP m... View_aa" />
 
+            <marker date="1584523553858" expanded="true" signature="95394:95475" ph="UPDATE TF_PO... " />
 
+            <marker date="1584523553858" expanded="true" signature="96728:97526" ph="SELECT itm,n... " />
 
+            <marker date="1584523553858" expanded="true" signature="96728:97529" ph="SELECT dep,d... MCAF" />
 
+            <marker date="1584523553858" expanded="true" signature="98261:98306" ph="SELECT MAX(N... " />
 
+            <marker date="1584523553858" expanded="true" signature="99929:100332" ph="INSERT INTO mcaf... " />
 
+            <marker date="1584523553858" expanded="true" signature="102899:103264" ph="UPDATE MCAF " />
 
+            <marker date="1584523553858" expanded="true" signature="102905:103264" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="104141:104192" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="104291:104342" ph="DELETE FROM " />
 
+            <marker date="1584523553858" expanded="true" signature="104706:105372" ph="SELECT b.dep... mf_mo" />
 
+            <marker date="1584523553858" expanded="true" signature="106245:106487" ph="SELECT isnul... DSCSETTING" />
 
+            <marker date="1584523553858" expanded="true" signature="106539:106724" ph="SELECT dep,d... DSCSETTING" />
 
+            <marker date="1584523553858" expanded="true" signature="109744:109831" ph="SELECT MAX(I... " />
 
+            <marker date="1584523553858" expanded="true" signature="110228:110458" ph="INSERT INTO MF_IEFILE... " />
 
+            <marker date="1584523553858" expanded="true" signature="110228:110685" ph="INSERT INTO MF_IEFILE... " />
 
+            <marker date="1584523553858" expanded="true" signature="110827:110896" ph="INSERT INTO TF_IEFILE_BOM... " />
 
+            <marker date="1584523553858" expanded="true" signature="111226:111299" ph="INSERT INTO TF_IEFILE_BOM... " />
 
           </folding>
 
         </state>
 
       </provider>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 7216 - 0
meib/logs/hwj.log


+ 11 - 9
meib/meib/apps/erp/lianxi.py
파일 보기 

@@ -1,8 +1,13 @@
 
 import datetime  #引入datetime模块

 

+# 获取时间

 str = datetime.datetime.now().strftime('%Y-%m')  #获取当前时间并转化成字符串

 print(str)

+# 切割

+# dep = request.GET["dep"].split('--')[0]

 import math

+a = "   a'a/a,s-d,e#q%i^d&d%"

+print(a.replace(" ", "").replace("/", "").replace(",", "").replace("-", "").replace("#", "").replace("%", "").replace("'", "").replace("^", "").replace("&", ""))

 

 # print(math.ceil(-4.9))

 

@@ -11,18 +16,15 @@ import base64
 
 # 方法encode()和decode()方法

 # a = base64.b64encode(b'hello world')

 

-print("ASDAD".lower())

-a = bytes(base64.b64encode('111'.encode())).decode()

-print(a)

-# b = base64.b64decode(b'aGVsbG8gd29ybGQ=')

-

-b = bytes(base64.b64decode('111'.encode())).decode()

-print(b)

 

+# %s          字符串

+# %d          整形

+# %c          单字符

+# %f           浮点数。控制为数 %.2f 保留两位小数

+# %x          十六进制

 

 #打印结果：

-b'aGVsbG8gd29ybGQ='

-b'hello world'

+

 #

 # print(str)   #输出字符串信息

+ 7 - 2
meib/meib/apps/erp/urls.py
파일 보기 

@@ -12,14 +12,19 @@ urlpatterns = [
 
     url(r'^erppt/$',views.pt.as_view()),  # 厂商付款单

     url(r'^index/$',views.index.as_view()),  # 渲染模板

     url(r'^listtb/$',views.listtb.as_view()),  # 一览表数据操作

-    url(r'^depmacfdepdata/$',views.DepMacfDepData.as_view()),  # 月度产能评估表获取不么数据

+    url(r'^depmacfdepdata/$',views.DepMacfDepData.as_view()),  # 月度产能评估表获取部门数据

     url(r'^depps/$',views.depps.as_view()),  # 月度产能评估表模板

     url(r'^depmacf/$',views.DepMacf.as_view()),  # 月度产能评估功能接口增删查改

     url(r'^dept/$',views.dept.as_view()),  # 查询部门

     url(r'^odd/$',views.monthly.as_view()),  # 查询生成月度产能评估表单号

     url(r'^oddno/$',views.oddNo.as_view()),  # 查询单号

-    url(r'^cust/$',views.Cust.as_view()),  # 查询单号

+    url(r'^cust/$',views.Cust.as_view()),  # 客户编码

+    url(r'^bom/$',views.Bom.as_view()),  # 客户编码

     url(r'^prdt/$',views.Prdt.as_view()),  # 查询货品编码

+    url(r'^dessettingtm/$',views.DesSettingtm.as_view()),  # 车间标准产能设置模板渲染

+    url(r'^dessetting/$',views.DesSetting.as_view()),  # 车间标准产能设置功能接口

+    url(r'^iefiletm/$',views.IeFiletm.as_view()),  # ie文件号管理模板渲染

+    url(r'^iefile/$',views.IeFile.as_view()),  # ie文件号管理功能接口

     url(r'^text/$',views.text.as_view()),  # 测试

 

 #客户预收冲应收

+ 376 - 101
meib/meib/apps/erp/views.py
파일 보기 

@@ -1673,6 +1673,150 @@ class pt(View):
 
                 "code": 200

             }

             return http.JsonResponse(context)

+

+# 获取部门数据

+class dept(View):

+    def get(self, request):

+        search_no = request.GET["search_no"]

+        if search_no != '':

+            search_no = ' DEP LIKE ' + "'" + '%%' + search_no + '%%' + "'" + ' OR ' + '[NAME] LIKE ' + "'" + '%%' + search_no + '%%' + "'"

+            # search_no = ' PRD_NO LIKE '+"'"+'%%'+search_no+'%%'+"'"

+            sql = """SELECT DEP,NAME FROM DEPT WHERE {0}""".format(search_no)

+        else:

+            sql = """SELECT top 100 DEP, NAME FROM DEPT """

+        data = []

+        result = executeQuery(sql)

+        # print(result)

+        if len(result) != 0:

+            for i in result:

+                data.append({"id": i["DEP"], "text": i["DEP"] + '--' + i["NAME"]})

+        context = {

+            "data": data,

+            "message": "获取部门成功",

+            "code": 200

+        }

+        return http.JsonResponse(context)

+# 获取货品资料

+class Prdt(View):

+    def get(self, request):

+        search_no = request.GET["search_no"]

+        if search_no != '':

+            search_no = ' PRD_NO LIKE ' + "'" + '%%' + search_no + '%%' + "'" + ' OR ' + '[NAME] LIKE ' + "'" + '%%' + search_no + '%%' + "'"

+            # search_no = ' PRD_NO LIKE '+"'"+'%%'+search_no+'%%'+"'"

+            sql = """SELECT PRD_NO,NAME FROM PRDT WHERE {0}""".format(search_no)

+        else:

+            sql = """SELECT top 100 PRD_NO,NAME FROM PRDT """

+        data = []

+        # print(sql)

+        with connection.cursor() as cursor:

+            try:

+                dep_data = cursor.execute(sql, []).fetchall()

+            except Exception:

+                context = {

+                    "data": data,

+                    "message": "没有获取到数据",

+                    "code": 510

+                }

+                return http.JsonResponse(context)

+        if len(dep_data) != 0:

+            for i in dep_data:

+                data.append({"id": i[0], "text": i[0] + '--' + i[1]})

+        # print(data)

+        context = {

+            "data": data,

+            "message": "获取货品成功",

+            "code": 200

+        }

+        return http.JsonResponse(context)

+# 获取客户信息

+class Cust(View):

+    def get(self, request):

+        search_no = request.GET["search_no"]

+        if search_no != '':

+            search_no = ' CUS_NO LIKE ' + "'" + '%%' + search_no + '%%' + "'" + ' OR ' + '[NAME] LIKE ' + "'" + '%%' + search_no + '%%' + "'"

+            # search_no = ' PRD_NO LIKE '+"'"+'%%'+search_no+'%%'+"'"

+            sql = """SELECT  CUS_NO,NAME FROM CUST WHERE {0}""".format(search_no)

+        else:

+            sql = """SELECT top 100 CUS_NO,NAME FROM CUST """

+        data = []

+        # print(sql)

+        with connection.cursor() as cursor:

+            try:

+                dep_data = cursor.execute(sql, []).fetchall()

+            except Exception:

+                context = {

+                    "data": data,

+                    "message": "没有获取到数据",

+                    "code": 510

+                }

+                return http.JsonResponse(context)

+        if len(dep_data) != 0:

+            for i in dep_data:

+                data.append({"id": i[0], "text": i[0] + '--' + i[1]})

+        # print(data)

+        context = {

+            "data": data,

+            "message": "获取部门成功",

+            "code": 200

+        }

+        return http.JsonResponse(context)

+

+# 获取BOM信息

+class Bom(View):

+    def get(self, request):

+        search_no = request.GET["search_no"]

+        if search_no != '':

+            search_no = ' BOM_NO LIKE ' + "'" + '%%' + search_no + '%%' + "'" + ' OR ' + '[NAME] LIKE ' + "'" + '%%' + search_no + '%%' + "'"

+            # search_no = ' PRD_NO LIKE '+"'"+'%%'+search_no+'%%'+"'"

+            sql = """SELECT BOM_NO,NAME FROM MF_BOM WHERE {0}""".format(search_no)

+        else:

+            sql = """SELECT top 100 BOM_NO,NAME FROM MF_BOM """

+        data = []

+        print(sql)

+        with connection.cursor() as cursor:

+            try:

+                dep_data = cursor.execute(sql, []).fetchall()

+            except Exception:

+                context = {

+                    "data": data,

+                    "message": "没有获取到数据",

+                    "code": 510

+                }

+                return http.JsonResponse(context)

+        if len(dep_data) != 0:

+            for i in dep_data:

+                data.append({"id": i[0], "text": i[0] + '--' + i[1]})

+        print(data)

+        context = {

+            "data": data,

+            "message": "BOM配方成功",

+            "code": 200

+        }

+        return http.JsonResponse(context)

+# 查询单号

+class oddNo(View):

+    def get(self, request):

+        search_no = request.GET["search_no"]

+        if search_no != '':

+            search_no = ' NO LIKE ' + "'" + '%%' + search_no + '%%' + "'" + ' OR ' + 'DEP_NAME LIKE ' + "'" + '%%' + search_no + '%%' + "'"+"ORDER BY NO DESC"

+            # search_no = ' PRD_NO LIKE '+"'"+'%%'+search_no+'%%'+"'"

+            sql = """SELECT NO,DEP_NAME FROM MCAF WHERE {0}""".format(search_no)

+        else:

+            sql = """SELECT top 20 NO, DEP_NAME FROM MCAF ORDER BY NO DESC"""

+        # print(sql)

+        data = []

+        result = executeQuery(sql)

+        # print(result)

+        if len(result) != 0:

+            for i in result:

+                data.append({"id": i["NO"], "text": i["NO"] + '--' + i["DEP_NAME"]})

+        # print(data)

+        context = {

+            "data": data,

+            "message": "获取单号成功",

+            "code": 200

+        }

+        return http.JsonResponse(context)

 # 渲染order.html模板数据订单一览表

 class index(View):

     def get(self, request):

@@ -1688,7 +1832,8 @@ class listtb(View):
 
         sort = request.GET['sort']

         business_time = request.GET['business_time']  #业务交期

         prd_no = request.GET['prd_no'].split('--')[0] #货品编码--这里需要进行切割，因为传过来的是编码+名称（’编码--名称‘）

-        sc_dep = request.GET['sc_dep']  #生产部门

+        sc_dep = request.GET['sc_dep'].split('--')[0]  #生产部门

+        # print(sc_dep)

         ym_type = request.GET['ym_type']  #研磨类型

         os_type = request.GET['os_type']  #订单类型

         capacity = request.GET['capacity']  #容量

@@ -1702,7 +1847,7 @@ class listtb(View):
 
         page = int(request.GET['page'])-1  #页码

         total_page = 0 #总页数

         total_count = 0  #总记录数

-        print(page)

+        # print(page)

         # 处理客户代号

         if len(cus_no)>0:

             cus_no = ' AND '+ 'CUS_NO='+"'"+cus_no+"'"

@@ -1874,7 +2019,6 @@ stuff((SELECT ';' + CAST(B.ITM AS VARCHAR(500)) FROM View_aa B WHERE A.OS_NO=B.O
 
             "code": 200

         }

         return http.JsonResponse(context)

-

     def put(self, request):

         # req_data = json.loads(request.body.decode())

         try:

@@ -1886,6 +2030,8 @@ stuff((SELECT ';' + CAST(B.ITM AS VARCHAR(500)) FROM View_aa B WHERE A.OS_NO=B.O
 
         PMC_DD = req_data.get("PMC_DD",'')

         WH_REM = req_data.get("WH_REM",'')

         ITM = req_data.get("ITM")

+        if OS_NO is None or ITM is None:

+            return http.HttpResponseForbidden("参数不能为空")

         with connection.cursor() as cursor:

             cursor.execute(

                 """UPDATE TF_POS_Z SET PMC_REM=%s,WH_REM=%s WHERE OS_ID='SO' AND OS_NO=%s AND ITM=%s """,

@@ -1895,7 +2041,7 @@ stuff((SELECT ';' + CAST(B.ITM AS VARCHAR(500)) FROM View_aa B WHERE A.OS_NO=B.O
 
             "code": 200

         }

         return http.JsonResponse(context)

-# 渲染dep_ps.html模板

+# 渲染dep_ps.html月度产能评估模板

 class depps(View):

     def get(self, request):

         return render(request, 'dep_ps.html')

@@ -1904,25 +2050,49 @@ class DepMacf(View):
 
     def get(self,request):

         # st_time = request.GET["st_time"]  # 开始时间

         data_time = request.GET["data_time"]

-        serch_dep = request.GET["serch_dep"]

-        serch_no = request.GET["serch_no"]

-        print(data_time)

-        print(serch_dep)

-        print(serch_no)

+        serch_dep = request.GET["serch_dep"].split('--')[0]  #部门编码--这里需要进行切割，因为传过来的是编码+名称（’编码--名称‘）

+        serch_no = request.GET["serch_no"].split('--')[0]  #单号--这里需要进行切割，因为传过来的是编码+名称（’单号--成品名称‘）

+        if len(data_time)==10:

+            data_time = "WHERE "+"left(Convert(varchar(100), dd, 23), 11)="+"'"+data_time+"'"

+        else:

+            return http.HttpResponseForbidden("输入的时间有问题")

+        if len(serch_dep)>0:

+            serch_dep =" AND " + "DEP="+"'"+serch_dep+"'"

+        else:

+            return http.HttpResponseForbidden("请选择部门")

+        if len(serch_no)>0:

+            serch_no = " AND "+"NO="+"'"+serch_no+"'"

+        # print(data_time)

+        # print(serch_dep)

+        # print(serch_no)

+        conditional = data_time+serch_dep+serch_no+" ORDER BY NO,ITM ASC"

+        sql = """SELECT itm,no as no,dep,dep_name as dep_name,cast(ok_qty as float) as ok_qty,cast(un_qty as float) as un_qty,

+    cast(s_capacity as float) as s_capacity ,cast(s_d_staffing as float) as s_d_staffing ,cast(e_capacity as float) as e_capacity ,cast(tolf_days as float) as tolf_days ,cast(epl_personnel as float) as epl_personnel ,cast(p_d_f_e_configurations as float) as p_d_f_e_configurations,

+    a_strength as a_strength ,cast(e_a_workers as float) as e_a_workers ,cast(work_sum as float) as work_sum,cast(zj_274_24 as float) as zj_274_24 ,cast(a_274_24 as float) as a_274_24 ,cast(new_personnel as float) as new_personnel ,rem as rem ,cast(need_hours as float) as need_hours, cast(a_25 as float) as a_25 ,

+    cast(e_d_workers as float) as e_d_workers ,cast(p_gap as float) as p_gap

+    from MCAF {0}""".format(conditional)

+        data = executeQuery(sql)

+        # print(sql)

+        if len(data)<=0:

+            return http.HttpResponseForbidden("没有查询单数据")

+        print(data)

         context = {

+            "data":data,

             "message": "查询成功",

             "code": 200

         }

         return http.JsonResponse(context)

     def post(self,request):

         # 获取数据

-        req_data = json.loads(request.body.decode())["params"]

-        print(req_data["data_list"])

-        t_today = datetime.datetime.now().strftime('%Y-%m-%d')  # 获取年月日

+        req_data = json.loads(request.body.decode())["data"]

+        # print(req_data["data_list"])

+        # t_today = datetime.datetime.now().strftime('%Y-%m-%d')  # 获取年月日

+        t_today = req_data.get("data_time_no")  # 获取年月日

         itm = 1 #定义项次

         with connection.cursor() as cursor:

             # 获取数据里面当天最大的单号，然后处理生产单号

             sql_no = """SELECT MAX(NO) AS NO FROM MCAF WHERE DD='{0}'""".format(t_today)

+            # print(sql_no)

             monthly_odd_new = monthly_odd(sql_no)  # 生产单号

             for i in req_data["data_list"]:

                 # 计算订单可维持天数

@@ -1956,6 +2126,7 @@ class DepMacf(View):
 
                            tolf_days,i["epl_personnel"],p_d_f_e_configurations,i["a_strength"],i["e_a_workers"]	,work_sum,

                            zj_274_24,a_274_24,new_personnel,i["rem"],need_hours,a_25,i["e_d_workers"],p_gap,i["ok_qty"])

                 itm +=1

+                # print(sql)

                 cursor.execute(sql,[])

         # data = {"monthly_odd_new":monthly_odd_new}

         context = {

@@ -1964,110 +2135,84 @@ class DepMacf(View):
 
             "code": 200

         }

         return http.JsonResponse(context)

-# 获取部门数据

-class dept(View):

-    def get(self, request):

+    def put(self,request):

+        # with connection.cursor() as cursor:

+        req_data = json.loads(request.body.decode())["data"]["data"]

+        # print(req_data)

         with connection.cursor() as cursor:

-            dep_data = cursor.execute("""SELECT DEP,NAME FROM DEPT WHERE MAKE_ID IN('1','3')""",[]).fetchall()

-            # print(dep_data)

-            data = []

-            # print(dep_data)

-            for i in dep_data:

-                # print(1111)

-                data.append({"DEP": i[0], "DEP_NAME": i[1]})

-            # print(data)

-            context = {

-                "data": data,

-                "message": "获取部门成功",

-                "code": 200

-            }

-            return http.JsonResponse(context)

-# 获取货品资料

-class Prdt(View):

-    def get(self,request):

-        search_no = request.GET["search_no"]

-        if search_no !='':

-            search_no = ' PRD_NO LIKE '+"'"+'%%'+search_no+'%%'+"'"+' OR ' + '[NAME] LIKE '+"'"+'%%'+search_no+'%%'+"'"

-            # search_no = ' PRD_NO LIKE '+"'"+'%%'+search_no+'%%'+"'"

-            sql = """SELECT PRD_NO,NAME FROM PRDT WHERE {0}""".format(search_no)

-        else:

-            sql = """SELECT top 100 PRD_NO,NAME FROM PRDT """

-        data = []

-        # print(sql)

-        with connection.cursor() as cursor:

-            try:

-                dep_data = cursor.execute(sql,[]).fetchall()

-            except Exception:

-                context = {

-                    "data": data,

-                    "message": "没有获取到数据",

-                    "code": 510

-                }

-                return http.JsonResponse(context)

-        if len(dep_data)!=0:

-            for i in dep_data:

-                data.append({"id": i[0], "text":i[0]+'--'+ i[1]})

-        # print(data)

+            for i in req_data:

+                print(i)

+                # 计算订单可维持天数

+                try:

+                    tolf_days = float(i["un_qty"]) / float(i["s_capacity"])

+                except Exception:

+                    return http.HttpResponseForbidden('计算订单可维持天数，被除数不能为零')

+                # 计算现有配置可生产天数

+                try:

+                    p_d_f_e_configurations = float(i["un_qty"]) / float(i["e_capacity"])

+                except Exception:

+                    return http.HttpResponseForbidden('计算现有可配置天数，被除数不能为零')

+                # 计算现有出勤人员合计

+                work_sum = float(i["e_a_workers"]) + float(i["e_d_workers"])

+                # 计算直接工人274小时/25天

+                zj_274_24 = (float(i["ok_qty"]) / (float(i["s_capacity"]) + float(i["s_d_staffing"]))) / 25

+                # 计算按274小时/25天配置人员

+                a_274_24 = (float(i["ok_qty"]) / (float(i["s_capacity"]) + float(i["s_d_staffing"]))) / 25 + float(

+                    i["e_a_workers"])

+                # 计算计划新增人员配置

+                new_personnel = (float(i["ok_qty"]) / (float(i["s_capacity"]) + float(i["s_d_staffing"]))) / 25 - float(

+                    i["e_d_workers"])

+                # 计算需求工时

+                need_hours = float(i["s_d_staffing"]) * (float(i["un_qty"]) / float(i["s_capacity"])) * 11

+                # 计算按25个工作日计算人员需求

+                a_25 = float(i["s_d_staffing"]) * (float(i["un_qty"]) / float(i["s_capacity"])) * 11 / 274 * 1.2

+                # 计算人员缺口

+                p_gap = float(i["s_d_staffing"]) * (

+                float(i["un_qty"]) / float(i["s_capacity"])) * 11 / 274 * 1.2 - float(i["e_d_workers"])

+                cursor.execute("""UPDATE MCAF SET ok_qty=%s, un_qty=%s, s_capacity=%s, s_d_staffing=%s, e_capacity=%s, tolf_days=%s, epl_personnel=%s,

+              p_d_f_e_configurations=%s, a_strength=%s, e_a_workers=%s, work_sum=%s, zj_274_24=%s, a_274_24=%s, new_personnel=%s, rem=%s,need_hours=%s, a_25=%s,

+              e_d_workers=%s, p_gap=%s

+              WHERE  dep=%s AND no=%s AND itm=%s""", [i["ok_qty"],i["un_qty"],i["s_capacity"],i["s_d_staffing"],i["e_capacity"],tolf_days,i["epl_personnel"]

+                    , p_d_f_e_configurations,i["a_strength"],i["e_a_workers"],work_sum,zj_274_24,a_274_24,new_personnel,i["rem"],need_hours,a_25

+                    ,i["e_d_workers"],p_gap,i["dep"], i["no"], i["itm"]])

         context = {

-            "data": data,

-            "message": "获取部门成功",

+            "message": "修改成功",

             "code": 200

         }

         return http.JsonResponse(context)

-# 获取客户信息

-class Cust(View):

-    def get(self, request):

-        search_no = request.GET["search_no"]

-        if search_no != '':

-            search_no = ' CUS_NO LIKE ' + "'" + '%%' + search_no + '%%' + "'" + ' OR ' + '[NAME] LIKE ' + "'" + '%%' + search_no + '%%' + "'"

-            # search_no = ' PRD_NO LIKE '+"'"+'%%'+search_no+'%%'+"'"

-            sql = """SELECT  CUS_NO,NAME FROM CUST WHERE {0}""".format(search_no)

-        else:

-            sql = """SELECT top 100 CUS_NO,NAME FROM CUST """

-        data = []

-        # print(sql)

-        with connection.cursor() as cursor:

-            try:

-                dep_data = cursor.execute(sql, []).fetchall()

-            except Exception:

-                context = {

-                    "data": data,

-                    "message": "没有获取到数据",

-                    "code": 510

-                }

-                return http.JsonResponse(context)

-        if len(dep_data) != 0:

-            for i in dep_data:

-                data.append({"id": i[0], "text":i[0] +'--'+ i[1]})

+    def delete(self,request):

+        # 获取参数

+        req_data = json.loads(request.body.decode())

+        dep = req_data["dep"]

+        no = req_data["no"]

+        itm = req_data["itm"]

+        data = req_data["data"]

+        # print(dep)

+        # print(no)

+        # print(itm)

         # print(data)

+        with connection.cursor() as cursor:

+            # 删除行

+            if dep!='':

+                cursor.execute("""DELETE FROM MCAF WHERE  dep=%s AND no=%s AND itm=%s""", [dep,no,itm])

+            #删除整张单

+            for i in data:

+                cursor.execute("""DELETE FROM MCAF WHERE  dep=%s AND no=%s AND itm=%s""", [i["dep"], i["no"], i["itm"]])

         context = {

-            "data": data,

-            "message": "获取部门成功",

-            "code": 200

-        }

-        return http.JsonResponse(context)

-# 查询单号

-class oddNo(View):

-    def get(self, request):

-        sql = ("SELECT TOP 5 MO_NO FROM MF_MO ")

-        result = executeQuery(sql)

-        context = {

-            "data": result,

-            "message": "获取单号成功",

+            "message": "删除成功",

             "code": 200

         }

         return http.JsonResponse(context)

-

 # 月度产能评估表更具部门获取数据

 class DepMacfDepData(View):

     def get(self, request):

-        dep = request.GET["dep"]

-        print(dep)

-        sql = ("""SELECT b.dep,b.name as dep_name,cast(sum(isnull(a.QTY_FIN,0)) as decimal(14,2)) as ok_qty,cast(sum(ISNULL(a.QTY,0)-isnull(a.QTY_FIN,0)) as decimal(14,2)) as un_qty,

-    0 as s_capacity ,0 as s_d_staffing ,0 as e_capacity ,0 as tolf_days ,0 as epl_personnel ,0 as p_d_f_e_configurations,

+        dep = request.GET["dep"].split('--')[0]  #部门编码--这里需要进行切割，因为传过来的是编码+名称（’编码--名称‘）

+        # print(dep)

+        sql = ("""SELECT b.dep,b.dep_name as dep_name,cast(sum(isnull(a.QTY_FIN,0)) as decimal(14,2)) as ok_qty,cast(sum(ISNULL(a.QTY,0)-isnull(a.QTY_FIN,0)) as decimal(14,2)) as un_qty,

+    cast(max(B.s_capacity) as float) as s_capacity ,cast(max(B.s_d_staffing) as float) as s_d_staffing ,0 as e_capacity ,0 as tolf_days ,0 as epl_personnel ,0 as p_d_f_e_configurations,

     '' as a_strength ,0 as e_a_workers ,0 as work_sum,0 as zj_274_24 ,0 as a_274_24 ,0 as new_personnel ,'' as rem ,0 as need_hours, 0 as a_25 ,

     0 as e_d_workers ,0 as p_gap

-    from mf_mo a left join dept b on a.dep=b.dep where isnull(a.CLOSE_ID,'')!='T' and a.dep='MMG01L1' group by b.dep,b.name""")

+    from mf_mo a left join DSCSETTING b on a.dep=b.dep where isnull(a.CLOSE_ID,'')!='T' and a.dep='MMG01L1' group by b.dep,b.dep_name""")

         result = executeQuery(sql)

         context = {

             "data": result[0],

@@ -2087,6 +2232,136 @@ class monthly(View):
 
             "code": 200

         }

         return http.JsonResponse(context)

+#车间标准产能设置渲染模板

+class DesSettingtm(View):

+    def get(self,request):

+        return render(request,'dessetting.html')

+# 车间标准产能设置渲染功能接口

+class DesSetting(View):

+    def get(self, request):

+        dep = request.GET["dep"].split('--')[0]

+        print(dep)

+        if len(dep)>0:

+            sql = """SELECT isnull(dep,'') as dep,isnull(dep_name,'') as dep_name,isnull(up_dd,'') as up_dd,

+        cast(isnull(s_capacity,0) as varchar(20)) as s_capacity,cast(isnull(s_d_staffing,0) as varchar(20)) as s_d_staffing FROM DSCSETTING WHERE DEP='{}' """.format(dep)

+        else:

+            sql = """SELECT isnull(dep,'') as dep,isnull(dep_name,'') as dep_name,isnull(up_dd,'') as up_dd,

+        isnull(s_capacity,0) as s_capacity,isnull(s_d_staffing,0) as s_d_staffing FROM DSCSETTING"""

+        print(sql)

+        try:

+            result = executeQuery(sql)

+        except Exception:

+            return http.HttpResponseForbidden('没有查询到数据')

+        data = [{"dep":"部门编码","dep_name":"部门名称","up_dd":"上次修改时间","s_capacity":"标准/满线产能","s_d_staffing":"标准直接人员配置","operation":"操作"}]

+        if len(result) != 0:

+            for i in result:

+                data.append({"dep": i["dep"], "dep_name": i["dep_name"] ,"up_dd": i["up_dd"].strftime('%Y-%m-%d'),"s_capacity": float(i["s_capacity"]),"s_d_staffing": float(i["s_d_staffing"])})

+        # print(data)

+        context = {

+            "data":data,

+            "message":'获取信息成功',

+            "code":'200'

+        }

+        return http.JsonResponse(context)

+    def put(self,request):

+        req_data = json.loads(request.body.decode())["data"]

+        dep = req_data.get("dep")

+        s_capacity = req_data.get("s_capacity")

+        s_d_staffing = req_data.get("s_d_staffing")

+        # up_dd = datetime.datetime.now()

+        up_dd = datetime.datetime.now().strftime('%Y-%m-%d')

+        if dep is None:

+            return http.HttpResponseForbidden("部门不能为空值")

+        sql = f"""UPDATE DSCSETTING SET s_capacity={s_capacity},s_d_staffing={s_d_staffing},up_dd=convert(datetime,'{up_dd}', 20)

+         WHERE DEP='{dep}'"""

+        print(sql)

+        with connection.cursor() as cursor:

+            cursor.execute(sql,[])

+        context = {

+            "message": "修改成功",

+            "code": 200

+        }

+        return http.JsonResponse(context)

+# ie文件号管理模板渲染

+class IeFiletm(View):

+    def get(self,request):

+        return render(request,'iefile.html')

+# ie文件号管理功能接口

+class IeFile(View):

+    def get(self,request):

+        content = {

+            "mssage":"ie文件查询成功",

+            "code":200

+        }

+        return http.JsonResponse(content)

+

+    @transaction.atomic

+    def post(self,request):

+        req_data = json.loads(request.body.decode())["data"]

+        hr_up = req_data["hr_up"]  #1小时管理费用（元/小时）

+        da_date = req_data["da_date"]  #收件日期

+        postil_up = req_data["postil_up"]  #文件批注单价

+        rem = req_data["rem"]  #文件批注单价

+        file_serial = req_data["file_serial"]  #IE工艺文件编号

+        total_manpower = req_data["total_manpower"]  #标准总人力(人)

+        workshop_name = req_data["workshop_name"]  #工段名称

+        point = req_data["point"]  #瓶颈时间（秒）

+        dep = req_data["dep"].split('--')[0]  #作业线体(部门)

+        dep_name = req_data["dep"].split('--')[1] #作业线体(部门名称)

+        job_time = req_data["job_time"]  #文作业时间（秒）

+        username = req_data["username"]  #输单电脑

+        sys_date = req_data["sys_date"]  #输单日期

+        list_bom = req_data["list_bom"]  #选择bom

+        list_qty = req_data["list_qty"]  #阶梯单价

+        print(req_data)

+        # 判断部门

+        if len(req_data["dep"])<=0:

+            return http.HttpResponseForbidden("请选择部门")

+        t_today = datetime.datetime.now().strftime('%Y-%m-%d')  # 获取年月日,用于插叙单号

+        with connection.cursor() as cursor:

+            # 获取数据里面当天最大的单号，然后处理生产单号

+            try:

+                sql_no = """SELECT MAX(right(iefile_no,LEN(iefile_no)-2)) AS NO FROM MF_IEFILE WHERE sys_date='{0}'""".format(t_today)

+                monthly_odd_new = monthly_odd(sql_no)  # 生产单号

+                monthly_odd_new = 'IE' + str(monthly_odd_new)

+            except Exception:

+                return http.HttpResponseForbidden("生成单号异常，请检查数据")

+            # print(monthly_odd_new)

+            sid = transaction.savepoint()  # 开启事物

+            try:

+                # 插入ie文件号表头

+                sql = """INSERT INTO MF_IEFILE(IEFILE_NO,HR_UP,AE_DATE,postil_up,rem,file_serial,total_manpower,user_no,workshop_name,point,dep,dep_name,job_time,sys_date)

+                VALUES('%s',%s,'%s',%s,'%s','%s',%s,'%s','%s',%s,'%s','%s',%s,'%s')"""\

+                %(str(monthly_odd_new),hr_up,da_date,postil_up,rem,file_serial,total_manpower,username,workshop_name,point,dep,dep_name,job_time,sys_date)

+                cursor.execute(sql, [])

+                # 插入表身BOM数据

+                if len(list_bom)>0:

+                    bom_itm = 1

+                    for i in list_bom:

+                        sql1 = """INSERT INTO TF_IEFILE_BOM(IEFILE_NO,BOM_NO,ITM)VALUES('%s','%s','%s')"""%(monthly_odd_new,i["BOM"],bom_itm)

+                        cursor.execute(sql1, [])

+                        bom_itm +=1

+                        # print(sql1)

+                # 插入表身阶梯单价

+                if len(list_qty)>0:

+                    qty_itm = 1

+                    for i in list_qty:

+                        sql1 = """INSERT INTO TF_IEFILE_UP(IEFILE_NO,QTY,UP,ITM)VALUES('%s','%s','%s','%s')""" % (

+                        monthly_odd_new, i["QTY"], i["UP"],qty_itm)

+                        cursor.execute(sql1, [])

+                        qty_itm += 1

+                        # print(sql1)

+            except Exception:

+                print(111)

+                return http.HttpResponseForbidden("数据增加失败")

+            transaction.savepoint_commit(sid)  # 提交事物

+            print(111)

+        content = {

+            "data": monthly_odd_new,

+            "mssage":"ie文件新增成功",

+            "code":200

+        }

+        return http.JsonResponse(content)

 # 测试

 class text(View):

     def get(self, request):

+ 99 - 0
meib/meib/static/css/iefile.css
파일 보기 

@@ -0,0 +1,99 @@
 
+.filter{

+    width: 100%;

+    height: 190px;

+    line-height: 30px;

+    margin-bottom: 0px;

+    border-bottom:solid 1px rgb(83, 78, 78);

+}

+

+.align_right{

+    text-align: right;

+}

+

+.align_left{

+    text-align: left;

+}

+.Watch_body{

+    margin: auto;

+    width: 1400px;

+    background-color: wheat;

+    /* border-bottom:1px solid #989494; */

+}

+.Watch_body div{

+    box-sizing:border-box;

+    height: 500px;

+    width: 700px;

+}

+.container_right{

+    /* border-bottom:1px solid #989494; */

+    border-left:1px solid #989494;

+    /* border-right:1px solid #989494; */

+    overflow:scroll;

+}

+.container_left{

+    /* border-bottom:1px solid #989494; */

+    border-left:1px solid #989494;

+    overflow:scroll;

+}

+/* .itm_right{

+    width: 20px;

+} */

+.btn {

+    padding: 3px 4px;

+}

+.list-unstyled{

+    margin-top: 20px;

+    margin-left: 20px;

+}

+.container_left .itm_left{

+    width: 70%;

+    height: 30px ;

+    line-height: 30px;

+    border-bottom:1px solid #989494; 

+    /* margin-top: 2px; */

+}

+.container_left .itm_left input{

+    width: 80% !important;

+}

+.container_left .itm_right{

+    width: 30%;

+    height: 30px ;

+    line-height: 30px;

+    border-bottom:1px solid #989494; 

+}

+.container_right .itm_left{

+    width: 45%;

+    height: 30px ;

+    line-height: 30px;

+    border-bottom:1px solid #989494; 

+    /* margin-top: 2px; */

+}

+.container_right .itm_right{

+    width: 45%;

+    height: 30px ;

+    line-height: 30px;

+    border-bottom:1px solid #989494; 

+}

+.container_right .itm_del{

+    height: 30px ;

+    line-height: 30px;

+    border-bottom:1px solid #989494; 

+}

+

+.left_float{

+    float: left;

+}

+.right_float{

+    float: right;

+}

+.footer_base{

+    border-top: 1px solid #989494 !important;

+    border-bottom: 1px solid #989494 !important;

+    height: 40px;

+    /* position:absolute;    */

+    /* bottom: 0; */

+}

+.footer_base .btn{

+    margin-top: 5px;

+    margin-left: 20px;

+}

+ 5 - 0
meib/meib/static/css/macf.css
파일 보기 

@@ -11,6 +11,11 @@
 
     padding: 0 !important;

     box-sizing: border-box !important;

 }

+.macf_022{

+    width: 55px !important;

+    padding: 0 !important;

+    box-sizing: border-box !important;

+}

 .macf_03{

     width: 100px !important;

     padding: 0 !important;

+ 29 - 0
meib/meib/static/js/ionicons.js
파일 보기 

@@ -0,0 +1,29 @@
 
+

+(function(doc){

+    var scriptElm = doc.scripts[doc.scripts.length - 1];

+    var warn = ['[ionicons] Deprecated script, please remove: ' + scriptElm.outerHTML];

+  

+    warn.push('To improve performance it is recommended to set the differential scripts in the head as follows:')

+  

+    var parts = scriptElm.src.split('/');

+    parts.pop();

+    parts.push('ionicons');

+    var url = parts.join('/');

+  

+    var scriptElm = doc.createElement('script');

+    scriptElm.setAttribute('type', 'module');

+    scriptElm.src = url + '/ionicons.esm.js';

+    warn.push(scriptElm.outerHTML);

+    scriptElm.setAttribute('data-stencil-namespace', 'ionicons');

+    doc.head.appendChild(scriptElm);

+  

+    scriptElm = doc.createElement('script');

+    scriptElm.setAttribute('nomodule', '');

+    scriptElm.src = url + '/ionicons.js';

+    warn.push(scriptElm.outerHTML);

+    scriptElm.setAttribute('data-stencil-namespace', 'ionicons');

+    doc.head.appendChild(scriptElm);

+  

+    console.warn(warn.join('\n'));

+  

+  })(document);

+ 93 - 79
meib/meib/static/js/jquery.select.js
파일 보기 

@@ -1,15 +1,16 @@
 
-(function($) {
 
-    $.selectSuggest = function(target, data, itemSelectFunction) {
 
-    		var defaulOption = {
 
-    			suggestMaxHeight: '400px',//弹出框最大高度
 
-    			itemColor : '#000000',//默认字体颜色
 
-    			itemBackgroundColor:'RGB(253,250,250)',//默认背景颜色
 
-    			itemOverColor : '#ffffff',//选中字体颜色
 
-    			itemOverBackgroundColor : '#ea0c3c',//选中背景颜色
 
-    			itemPadding : 5 ,//item间距
 
-    			fontSize : 15 ,//默认字体大小
 
-    			alwaysShowALL : true //点击input是否展示所有可选项
 
-    			};
 
+(function ($) {
 
+    $.selectSuggest = function (target, data, itemSelectFunction) {
 
+        var defaulOption = {
 
+            suggestMaxHeight: '400px',//弹出框最大高度
 
+            itemColor: '#000000',//默认字体颜色
 
+            itemBackgroundColor: 'RGB(253,250,250)',//默认背景颜色
 
+            itemOverColor: '#ffffff',//选中字体颜色
 
+            itemOverBackgroundColor: '#ea0c3c',//选中背景颜色
 
+            itemPadding: 5,//item间距
 
+            fontSize: 15,//默认字体大小
 
+            alwaysShowALL: true //点击input是否展示所有可选项
 
+        };
 
+        var timer = null;
 
         var maxFontNumber = 0;//最大字数
 
         var currentItem;
 
         var suggestContainerId = target + "-suggest";
 
@@ -17,7 +18,7 @@
 
         var suggestContainerLeft = $('#' + target).offset().left;
 
         var suggestContainerTop = $('#' + target).offset().top + $('#' + target).outerHeight();
 
 
-        var showClickTextFunction = function() {
 
+        var showClickTextFunction = function () {
 
             $('#' + target).val(this.innerText);
 
             currentItem = null;
 
             $('#' + suggestContainerId).hide();
 
@@ -33,105 +34,118 @@
 
         suggestContainer.attr('id', suggestContainerId);
 
         suggestContainer.attr('tabindex', '0');
 
         suggestContainer.hide();
 
-        var _initItems = function(items) {
 
+        var _initItems = function (items) {
 
             suggestContainer.empty();
 
+            if (items.length >= 5000) {
 
+                alert("插叙模糊查询到数据超过5000笔，请重新输入精确查询条件")
 
+                return
 
+            }
 
             for (var i = 0; i < items.length; i++) {
 
-            		if(items[i].text.length > maxFontNumber){
 
-            			maxFontNumber = items[i].text.length;
 
-            			}
 
+                if (items[i].text.length > maxFontNumber) {
 
+                    maxFontNumber = items[i].text.length;
 
+                }
 
+                // if (Math.round(i % 1000) == 0) {
 
+                //     console.log("被整除了")
 
+                //     timer && clearTimeout(timer);
 
+                //     timer = setTimeout(function () {
 
+                //         console.log("延迟")
 
+                //     }, 1000);
 
+                // }
 
                 var suggestItem = $('<div></div>'); //创建一个子<div>
 
                 suggestItem.attr('id', items[i].id);
 
                 suggestItem.append(items[i].text);
 
                 suggestItem.css({
 
-                		'padding':defaulOption.itemPadding + 'px',
 
-                    'white-space':'nowrap',
 
+                    'padding': defaulOption.itemPadding + 'px',
 
+                    'white-space': 'nowrap',
 
                     'cursor': 'pointer',
 
                     'background-color': defaulOption.itemBackgroundColor,
 
                     'color': defaulOption.itemColor
 
                 });
 
                 suggestItem.bind("mouseover",
 
-                function() {
 
-                    $(this).css({
 
-                        'background-color': defaulOption.itemOverBackgroundColor,
 
-                        'color': defaulOption.itemOverColor
 
+                    function () {
 
+                        $(this).css({
 
+                            'background-color': defaulOption.itemOverBackgroundColor,
 
+                            'color': defaulOption.itemOverColor
 
+                        });
 
+                        currentItem = $(this);
 
                     });
 
-                    currentItem = $(this);
 
-                });
 
                 suggestItem.bind("mouseout",
 
-                function() {
 
-                    $(this).css({
 
-                        'background-color': defaulOption.itemBackgroundColor,
 
-                        'color': defaulOption.itemColor
 
+                    function () {
 
+                        $(this).css({
 
+                            'background-color': defaulOption.itemBackgroundColor,
 
+                            'color': defaulOption.itemColor
 
+                        });
 
+                        currentItem = null;
 
                     });
 
-                    currentItem = null;
 
-                });
 
                 suggestItem.bind("click", showClickTextFunction);
 
                 suggestItem.bind("click", itemSelectFunction);
 
                 suggestItem.appendTo(suggestContainer);
 
                 suggestContainer.appendTo(document.body);
 
+
 
             }
 
         }
 
 
-        var inputChange = function() {
 
+        var inputChange = function () {
 
             var inputValue = $('#' + target).val();
 
             inputValue = inputValue.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
 
             var matcher = new RegExp(inputValue, "i");
 
             return $.grep(data,
 
-            function(value) {
 
-                return matcher.test(value.text);
 
-            });
 
+                function (value) {
 
+                    return matcher.test(value.text);
 
+                });
 
         }
 
-
 
-        $('#' + target).bind("keyup",
 
-        function() {
 
-            _initItems(inputChange());
 
-        });
 
+        //这里是控制静态查找
 
+        // $('#' + target).bind("keyup",
 
+        //     function () {
 
+        //         _initItems(inputChange());
 
+        //     });
 
         $('#' + target).bind("blur",
 
-        function() {
 
-        		if(!$('#' + suggestContainerId).is(":focus")){
 
-        			$('#' + suggestContainerId).hide();
 
-        			if (currentItem) {
 
-                currentItem.trigger("click");
 
-            	}
 
-            	currentItem = null;
 
-        			return;
 
-        			}                       
-        });
 
+            function () {
 
+                if (!$('#' + suggestContainerId).is(":focus")) {
 
+                    $('#' + suggestContainerId).hide();
 
+                    // console.log("啊啊啊啊被点击")
 
+                    if (currentItem) {
 
+                        currentItem.trigger("click");
 
+                    }
 
+                    currentItem = null;
 
+                    return;
 
+                }
 
+            });
 
 
         $('#' + target).bind("click",
 
-        function() {
 
-            if (defaulOption.alwaysShowALL) {
 
-                _initItems(data);
 
-            } else {
 
-                _initItems(inputChange());
 
-            }
 
-            $('#' + suggestContainerId).removeAttr("style");
 
-            var tempWidth = defaulOption.fontSize*maxFontNumber + 2 * defaulOption.itemPadding + 30;
 
-            var containerWidth = Math.max(tempWidth, suggestContainerWidth);
 
-            $('#' + suggestContainerId).css({
 
-                'border': '1px solid #ccc',
 
-                'max-height': '400px',  //设置高度
 
-                'top': suggestContainerTop,
 
-                'left': suggestContainerLeft,
 
-                'width': containerWidth,
 
-                'position': 'absolute',
 
-                'font-size': defaulOption.fontSize+'px',
 
-                'font-family':'Arial',
 
-                'z-index': 99999,
 
-                'background-color': '#FFFFFF',
 
-                'overflow-y': 'auto',
 
-                'overflow-x': 'hidden',
 
-                'white-space':'nowrap'
 
+            function () {
 
+                if (defaulOption.alwaysShowALL) {
 
+                    // console.log("被点击数据没有变动")
 
+                    // _initItems(data);
 
+                } else {
 
+                    _initItems(inputChange());
 
+                }
 
+                $('#' + suggestContainerId).removeAttr("style");
 
+                var tempWidth = defaulOption.fontSize * maxFontNumber + 2 * defaulOption.itemPadding + 30;
 
+                var containerWidth = Math.max(tempWidth, suggestContainerWidth);
 
+                $('#' + suggestContainerId).css({
 
+                    'border': '1px solid #ccc',
 
+                    'max-height': '400px',  //设置高度
 
+                    'top': suggestContainerTop,
 
+                    'left': suggestContainerLeft,
 
+                    'width': containerWidth,
 
+                    'position': 'absolute',
 
+                    'font-size': defaulOption.fontSize + 'px',
 
+                    'font-family': 'Arial',
 
+                    'z-index': 99999,
 
+                    'background-color': '#FFFFFF',
 
+                    'overflow-y': 'auto',
 
+                    'overflow-x': 'hidden',
 
+                    'white-space': 'nowrap'
 
 
+                });
 
+                $('#' + suggestContainerId).show();
 
             });
 
-            $('#' + suggestContainerId).show();
 
-        });
 
         _initItems(data);
 
-
 
         $('#' + suggestContainerId).bind("blur",
 
-        function() {
 
-            $('#' + suggestContainerId).hide();
 
-        });
 
+            function () {
 
+                $('#' + suggestContainerId).hide();
 
+            });
 
 
     }
 
 })(jQuery);

+ 232 - 159
meib/meib/templates/dep_ps.html
파일 보기 

@@ -13,6 +13,10 @@
 
     <script src="/static/js/bootstrap.min.js"></script>

     <script src="/static/js/vue-2.4.0.js"></script>

     <script src="/static/js/axios.min.js"></script>

+    <!-- 用户操作cookie -->

+    <script src="/static/js/vue-Cookies.js"></script>

+    <!-- 下拉搜索插件 -->

+    <script type="text/javascript" src="/static/js/jquery.select.js"></script>

     <script src="/static/js/bootstrap-select_new.js"></script>

     <script src="/static/js/layer.js"></script>

 

@@ -42,7 +46,6 @@
 
                             </a>

                             <ul class="nav dropdown-menu">

                                 <li><a href="/index">订单一览表</a></li>

-                                <li><a href="#">已结案订单</a></li>

                             </ul>

                         </li>

                         <li class="dropdown">

@@ -52,8 +55,8 @@
 
                                 <b class="caret"></b>

                             </a>

                             <ul class="nav dropdown-menu">

-                                <li><a href="#">汇总分析</a></li>

-                                <li><a href="#">订单完成情况</a></li>

+                                <li><a href="/depps">月度产能评估表</a></li>

+                                <li><a href="/dessettingtm">车间标准产能设置</a></li>

                             </ul>

                         </li>

                         <li class="dropdown">

@@ -63,10 +66,30 @@
 
                                 <b class="caret"></b>

                             </a>

                             <ul class="nav dropdown-menu">

-                                <li><a href="/dep_sp">计划主交期</a></li>

+                                <li><a href="/depps">计划主交期</a></li>

                                 <li><a href="#">计划部门交期</a></li>

                             </ul>

                         </li>

+                        <li class="dropdown">

+                            <!--ie文件号管理-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                IE工艺文件号管理

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/iefiletm">新增IE工艺文件号</a></li>

+                                <li><a href="#">IE工艺文件号维护</a></li>

+                                <li><a href="#">IE效率明细表</a></li>

+                                <li><a href="#">IE效率统计表</a></li>

+                            </ul>

+                        </li>

+                    </ul>

+                    <ul class="nav navbar-nav navbar-right">

+                        <li v-if="username !=''">

+                            <a>{% verbatim %}{{ '欢迎'+username+'！！！' }} {% endverbatim %}</a>

+                        </li>

+                        <li v-else><a href="">请登录</a></li>

+                        <li><a href="/logout/" @click="logout()">退出登录</a></li>

                     </ul>

                 </div>

             </div>

@@ -75,32 +98,32 @@
 
         <div class="filter">

             <div class="container ">

                 <label>

-                    <div class="navbar-nav">时间：</div>

+                    <div class="navbar-nav">日期：</div>

 

                     <div class="navbar-nav"><input type='date' class="input form-control" v-model="data_time" /></div>

                 </label>

                 <label>

                     <div class="navbar-nav">部门：</div>

-                    <!-- <input type='text' class="input" v-model="DEPT" /> -->

-                    <div class="navbar-nav"><select class="selectpicker form-control" data-live-search="true"

-                            v-model="DEP_DEP" id="field1"></select>

+                    <div class="navbar-nav">

+                        <input class="input form-control" id="testInput" type="text" autocomplete="off" />

                     </div>

                 </label>

                 <label>

 

                     <div class="navbar-nav">单号：</div>

-                    <div class="navbar-nav"><select class="selectpicker form-control" data-live-search="true"

-                            v-model="mo_no" id="field2"></select></div>

+                    <div class="navbar-nav">

+                        <input class="input form-control" id="testInput2" type="text" autocomplete="off" />

+                    </div>

                 </label>

-                <label class="save def" id="def" @click="seek()">

-                    <div class="btn btn-primary navbar-nav">确定查询</div>

+                <label class="save def" id="def">

+                    <div class="btn btn-primary navbar-nav" @click="seek()">确定查询</div>

                 </label>

             </div>

         </div>

         <!-- 内容 -->

         <!-- container这个类是设置居中对齐 -->

         <div class="container">

-            <button class="btn btn-primary" data-toggle="modal" data-target="#myModal" @click="zengjia()">新增</button>

+            <button class="btn btn-primary" data-toggle="modal" data-target="#myModal" @click="newly()">新增</button>

             <div class="modal fade" id="myModal">

                 <div class="modal-dialog">

                     <div class="modal-content" style="width: 300px;">

@@ -113,9 +136,12 @@
 
                             <table>

                                 <tr>

                                     <td>灌装生产线：

-                                        <select class="selectpicker form-control" data-live-search="true"

-                                            v-model="DEP_DEP" id="field">

-                                        </select>

+                                        <input class="input form-control" id="testInput1" type="text" autocomplete="off" />

+                                    </td>

+                                </tr>

+                                <tr>

+                                    <td>日期：

+                                        <input type='date' class="input form-control" v-model="data_time_no" />

                                     </td>

                                 </tr>

                             </table>

@@ -129,17 +155,23 @@
 
                 </div>

             </div>

             <button class="btn btn-primary abc" @click="add_no()" disabled="disabled">保存</button>

-            <button class="btn btn-primary update" @click="add_no()" disabled="disabled">修改</button>

-            <button class="btn btn-primary del" @click="add_no()" disabled="disabled">删除</button>

+            <button class="btn btn-primary update" @click="update()" disabled="disabled">修改</button>

+            <button class="btn btn-primary del" @click=del('','','','',data_list) disabled="disabled">删除</button>

             <label>

                 <div class="input">

                     单号：<input type="text" v-model="monthly_odd_new" disabled="disabled">

                 </div>

             </label>

+            <label>

+                <div class="input">

+                    日期：<input type='date' v-model="data_time_no" disabled="disabled">

+                </div>

+            </label>

             <table class="table table-bordered table-hover table-striped">

                 <tbody>

                     <tr>

                         <td class="macf_01">序号</td>

+                        <td class="macf_022">单号</td>

                         <td class="macf_02">产线</td>

                         <td class="macf_03">产线名称</td>

                         <td class="macf_04">未完工数量</td>

@@ -162,11 +194,12 @@
 
                         <td class="macf_21">备注</td>

                         <td class="macf_22">操作</td>

                     </tr>

-                    <!-- <tr v-for="(item,i) in data_list" :key="item.DEP_DEP" class="itm_tr" > -->

                     <tr class="save" v-for="(item,i) in data_list" :key="item.DEP_DEP"

                         :class="i == activeIndex?'tr_active':''">

                         <!--这里是序号-->

                         <td class="macf_01" v-text="i+1"></td>

+                        <!-- 单号 -->

+                        <td class="macf_022" v-text="item.no"></td>

                         <!--产线-->

                         <td class="macf_02" v-text="item.dep"></td>

                         <!--产线名称-->

@@ -175,28 +208,28 @@
 
                         <td class="macf_04"><input class="macf_04 macf_td" type="number" v-model="item.un_qty"

                                 disabled="disabled"></td>

                         <!--标准/满线日产能-->

-                        <td class="macf_05"><input class="macf_05 macf_td" type="number" v-model="item.s_capacity"></td>

+                        <td class="macf_05"><input class="macf_05 macf_td" type="number" min="0" v-model="item.s_capacity"></td>

                         <!--订单可维持天数-->

-                        <td class="macf_07"><input class="macf_07 macf_td" type="number"

+                        <td class="macf_07"><input class="macf_07 macf_td" type="number" min="0"

                                 v-bind:value="Number(item.un_qty)/Number(item.s_capacity) | rounding"

                                 disabled="disabled"></td>

                         <!--标准直接人员配置-->

-                        <td class="macf_06"><input class="macf_06 macf_td" type="number" v-model="item.s_d_staffing">

+                        <td class="macf_06"><input class="macf_06 macf_td" type="number" min="0" v-model="item.s_d_staffing">

                         </td>

                         <!--现有产能-->

-                        <td class="macf_08"><input class="macf_08 macf_td" type="number" v-model="item.e_capacity"></td>

+                        <td class="macf_08"><input class="macf_08 macf_td" type="number" min="0" v-model="item.e_capacity"></td>

                         <!--现有生产线/人员-->

-                        <td class="macf_09"><input class="macf_09 macf_td" type="number" v-model="item.epl_personnel">

+                        <td class="macf_09"><input class="macf_09 macf_td" type="number" min="0" v-model="item.epl_personnel">

                         </td>

                         <!--现有配置可生产天数-->

                         <td class="macf_10"><input class="macf_10 macf_td" type="number"

                                 v-bind:value="Number(item.un_qty)/Number(item.e_capacity) | rounding"

                                 disabled="disabled"></td>

                         <!--现有辅助工人-->

-                        <td class="macf_11"><input class="macf_11 macf_td" type="number" v-model="item.e_a_workers">

+                        <td class="macf_11"><input class="macf_11 macf_td" type="number" min="0" v-model="item.e_a_workers">

                         </td>

                         <!--现有直接工人-->

-                        <td class="macf_18"><input class="macf_18 macf_td" type="number" v-model="item.e_d_workers">

+                        <td class="macf_18"><input class="macf_18 macf_td" type="number" min="0" v-model="item.e_d_workers">

                         </td>

                         <!--现有出勤人员合计-->

                         <td class="macf_12"><input class="macf_12 macf_td" type="number"

@@ -232,7 +265,7 @@
 
                         <td class="macf_21"><textarea class="macf_21 macf_td" rows="1" cols="10"

                                 v-model="item.rem"></textarea></td>

                         <!--操作-->

-                        <td class="macf_22"><button class="btn btn-primary row_del" @click="del()">删除</button></td>

+                        <td class="macf_22"><button class="btn btn-primary row_del" @click="del(i,item.dep,item.no,item.itm,'')">删除</button></td>

                     </tr>

                 </tbody>

             </table>

@@ -245,28 +278,16 @@
 
         var vm = new Vue({

             el: '#app',

             data: {

-                data_time: '',

-                DEPT: '',

-                ODD: '',

-                activeIndex: 0,

-                list: [],

-                DEP_DEP: '',

-                DEP_QTY: 0,

-                DEP_CN: 0,

-                DEP_RY: '',

-                DEP_WCTS: '',

-                DEP_BZ: '',

-                DEP_SJGS: '',

-                DEP_RS: '',

-                DEP_ZJRG: '',

-                DEP_RYQK: '',

-                qty: 0,

-                add_date: [],

-                data_list: [],

-                test: [{ "DEP": "1", "DEP_NAME": "2" }, { "DEP": "1", "DEP_NAME": "2" }],

-                monthly_odd_new: '保存显示',

-                list_no: [],

-                list_dep: [],

+                username: '',  //用户名

+                data_time: '',  //用户查询日期

+                activeIndex: 0, //用于设置选择表格行变化颜色

+                DEP_QTY: 0,     //sum()函数测试计算用

+                DEP_CN: 0,      //sum()函数测试计算用

+                qty: 0,         //sum()函数测试计算用

+                add_date: [],   //用于监控测试

+                data_list: [],   //用户新增查询部门得到的数据保存

+                monthly_odd_new: '保存显示',    //用于前台单号的显示与否

+                data_time_no:'',   //单据日期

                 activeIndex: 0,  //激活选中tr的颜色变化

                 mo_no: '',  //重构开始

                 dep: '',  //车间部门

@@ -292,41 +313,43 @@
 
                 e_d_workers: 0,   //现有直接工人

                 p_gap: 0,  //人员缺口

             },

+            mounted() {

+                // 获取登录名

+                // this.username=getCookie('username');

+                this.username = $cookies.get('username')

+                // console.log($cookies.get('username'))

+            },

             methods: {

                 // 根据部门查询后台数据

                 add_dep_data() {

                     // 获取搜索框的值

-                    var serch_var = $("#field").selectpicker('val')

+                    var serch_var = $("#testInput1").val()

                     // alert('qq')

                     if (serch_var == '' | typeof serch_var === 'undefined') {

                         alert("请选择部门")

                         return

                     }

-                    this.DEP_DEP = serch_var

-                    if (this.DEP_DEP == '') {

+                    if (serch_var == '') {

                         alert("部门没选择上")

                         return

                     }

                     axios.get('/depmacfdepdata/', {

                         params: {

-                            dep: this.DEP_DEP

+                            dep: serch_var

                         }

                     })

                         .then(res => {

                             // alert(res.data)

                             var itm = res.data.data

                             this.data_list.push(itm)

-                            // this.data_list = res.data.data

                             console.log(this.data_list)

                         })

                         .catch(err => {

-                            console.log('error:' + err)

+                            alert(err.response["data"] + err.response["status"])

                         })

                 },

-

                 // 保存单据

                 add_no() {

-

                     //获取单号

                     // 判断有没有数据

                     if (this.data_list.length == 0) {

@@ -336,8 +359,9 @@
 
                     if (this.monthly_odd_new !== '') {

                         {

                             axios.post('/depmacf/', {

-                                params: {

+                                data: {

                                     data_list: this.data_list,

+                                    data_time_no:this.data_time_no

                                 }

                             })

                                 .then(res => {

@@ -361,38 +385,59 @@
 
                     this.monthly_odd_new = '保存显示'

                     // 

                 },

-

                 // 获取每一行的计算栏位qty

                 qty_sum(i) {

                     this.add_date[i]["qty"] = Number(this.add_date[i]["DEP_QTY"]) + Number(this.add_date[i]["DEP_CN"])

                     console.log(this.add_date[i]["qty"])

                 },

-                // 删除ni zhaod每一行

-                del(i) {

-                    // this.add_date.$remove(i);

-                    this.data_list.splice(i, 1);

+                // 修改操作

+                update(){

                     console.log(this.data_list)

+                    axios.put('/depmacf/', {

+                        data: {

+                            data:this.data_list

+                        }

+                    })

+                        .then(res => {

+                            // alert(res.data)

+                            console.log("修改成功")

+                            // this.data_list='';

+                        })

+                        .catch(err => {

+                            alert(err.response["data"] + err.response["status"])

+                        })

                 },

-

-                zengjia() {

-                    // 点击新增的时候渲染下来列表

-                    // 1、获取下拉列表的元素直接赋值tempIdStr

-                    // 2、如果tempIdStr值为空的话则走if流程

-                    $('#field').selectpicker('refresh');

-                    var tempIdStr = $("#field").html();

-                    $("#field").html(tempIdStr)

-                    if (tempIdStr == '') {

-                        var tempIdStr = '<option  value="">选择1111</option>';

-                        // var tempIdStr = '<option  value="' + this.list[0]['DEP'] + '" v-bind:value="DEP_DEP">' + this.list[0]['DEP'] + '---' + this.list[0]['DEP'] + '</option>';

-                        $("#field").append(tempIdStr);

-                        $.each(this.list_dep, function (i, item) {

-                            var tempId = '<option  value="' + item.DEP + '" v-bind:value="DEP_DEP">' + item.DEP + '---' + item.DEP_NAME + '</option>';

-                            $("#field").append(tempId);

-                            // alert(tempId)

-                        });

-                        // 更新 。 这一步很重要

-                        $('#field').selectpicker('refresh');

-                    }

+                // 删除操作

+                del(i,dep,no,itm,data) {

+                    // this.add_date.$remove(i);

+                    console.log(dep)

+                    console.log(no)

+                    console.log(itm)

+                    console.log(data)

+                    axios.delete('/depmacf/', {

+                        data: {

+                            dep: dep,

+                            no:no,

+                            itm:itm,

+                            data:data

+                        }

+                    })

+                        .then(res => {

+                            // alert(res.data)

+                            console.log("删除成功")

+                            if(data!==''){

+                                this.data_list='';

+                            }

+                            else{

+                                this.data_list.splice(i, 1);

+                            }

+                        })

+                        .catch(err => {

+                            alert(err.response["data"] + err.response["status"])

+                        })

+                },

+                //新增

+                newly() {

                     // 如果是新增另外一张单的话那么清空数据

                     if ($(".abc").prop("disabled") == true) {

                         this.data_list = [];

@@ -410,11 +455,11 @@
 
                 // 查询单据

                 seek() {

                     console.log('查询单据')

-

                     // 获取搜索框的部门

-                    var serch_dep = $("#field1").selectpicker('val')

+                    var serch_dep = $("#testInput").val()

                     // 获取搜索框的单号

-                    var serch_no = $("#field2").selectpicker('val')

+                    var serch_no = $("#testInput2").val()

+                    console.log(serch_no)

                     if (serch_dep == '' & serch_no == '') {

                         alert('请选择赛选条件')

                         return

@@ -429,84 +474,28 @@
 
                             "serch_no": serch_no

                         }

                     }).then(res => {

-

                         // 请求成功后的操作

                         //设置保存按钮为禁止效果

                         $(".abc").attr("disabled", "disabled");

-                        //移除修改按钮禁止效果disabled

-                        $('.update').removeAttr('disabled')

-                        //移除删除按钮禁止效果disabled

-                        $('.del').removeAttr('disabled')

+                        if (serch_no!==''){

+                            //移除修改按钮禁止效果disabled

+                            $('.update').removeAttr('disabled')

+                            //移除删除按钮禁止效果disabled

+                            $('.del').removeAttr('disabled')

+                        }

                         //设置删除行按钮为禁止效果

-                        $(".row_del").attr("disabled", "disabled");

-                        console.log(res.data)

+                        // $(".row_del").attr("disabled", "disabled");

+                        this.data_list=''

+                        var data = res.data.data

+                        this.data_list = data

+                        // console.log(this.data_list[0]["no"])

+                        // console.log(this.data_list)

+                        // console.log(res.data)

                     }).catch(err => {

                         //请求错误的处理

+                        alert(err.response["data"] + err.response["status"])

                     })

                 },

-                // 查询部门

-                select_dep() {

-                    axios.get('/dept/', {

-                        // params: {

-                        //     st_time: '',

-                        //     sh_time: '',

-                        //     cus_no: '',

-                        //     cls_id: '',

-                        //     pmc_ok: '',

-                        // }

-                    })

-                        .then(res => {

-                            // alert(res.data)

-                            var data1 = res.data.data

-                            this.list_dep = data1

-                            // console.log(this.list)

-                            // 设置下拉搜索

-                            var tempIdStr = '<option  value="">选择部门</option>';

-                            // var tempIdStr = '<option  value="' + this.list[0]['DEP'] + '" v-bind:value="DEP_DEP">' + this.list[0]['DEP'] + '---' + this.list[0]['DEP'] + '</option>';

-                            $("#field1").append(tempIdStr);

-                            $.each(this.list_dep, function (i, item) {

-                                var tempId = '<option  value="' + item.DEP + '" v-bind:value="DEP_DEP">' + item.DEP + '---' + item.DEP_NAME + '</option>';

-                                $("#field1").append(tempId);

-                                // alert(tempId)

-                            });

-                            // 更新 。 这一步很重要

-                            $('#field1').selectpicker('refresh');

-

-                        })

-                        .catch(err => {

-                            console.log('error:' + err)

-                        })

-                },

-                // 查询单号

-                select_odd() {

-                    axios.get('/oddno/', {

-                        // params: {

-                        //     st_time: '',

-                        //     sh_time: '',

-                        //     cus_no: '',

-                        //     cls_id: '',

-                        //     pmc_ok: '',

-                        // }

-                    })

-                        .then(res => {

-                            // alert(res.data)

-                            var data1 = res.data.data

-                            this.list_no = data1

-                            // 设置下拉搜索

-                            var tempIdStr = '<option  value="">选择单号</option>';

-                            $("#field2").append(tempIdStr);

-                            $.each(this.list_no, function (i, item) {

-                                var tempId = '<option  value="' + item.MO_NO + '" v-bind:value="mo_no">' + item.MO_NO + '---' + item.MO_NO + '</option>';

-                                $("#field2").append(tempId);

-                            });

-                            // 更新 。 这一步很重要

-                            $('#field2').selectpicker('refresh');

-

-                        })

-                        .catch(err => {

-                            console.log('error:' + err)

-                        })

-                },

                 //获取当前日期

                 addDate() {

                     var date = new Date();

@@ -522,7 +511,23 @@
 
                     }

                     var currentdate = year + seperator1 + month + seperator1 + strDate;

                     // console.log(currentdate)

-                    this.data_time = currentdate

+                    this.data_time = this.data_time_no = currentdate

+                },

+                //退出登录

+                logout() {

+                    console.log("qweq")

+                    axios.delete('/login/', {

+                        params: {

+                            user_1: this.user_1,

+                            pswd: this.pswd,

+                        }

+                    })

+                        .then(res => {

+

+                        })

+                        .catch(err => {

+                        })

+

                 },

             },

             filters: {

@@ -537,8 +542,6 @@
 
             },

             created() {

                 this.addDate()

-                this.select_dep()

-                this.select_odd()

 

             },

             watch: {

@@ -548,7 +551,77 @@
 
 

                 }

             },

+        });

+        $(function () {

+            // 开始写 jQuery 代码...

+            var timer = null;

+            // 定义一个公用的搜索接口

+            function getStr(n, url, field, clickif) {

+                //n为搜索的参数 url为请求的路由，filed是定位表单的id,

+                //clickif用于判断是否是第一次加载，如果不是第一次加载则需要模拟点击

+                var search = n

+                // 配置路由

+                if (typeof search === 'undefined') {

+                    search = ''

+                };

+                // console.log(search)

+                axios.get(url, {

+                    params: {

+                        search_no: search

+                    }

+                })

+                    .then(res => {

+                        // alert(res.data)

+                        var data1 = res.data.data

+                        datas = data1

+                        // console.log(datas)

+                        if (datas.length == 0) {

+                            alert("没有搜索到数据")

+                            return

+                        }

+                        $.selectSuggest(field, datas);

+                        // 是否第一次进入

+                        if (clickif !== 1) {

+                            $("#" + field).trigger("click");

+                        }

+                    })

+                    .catch(err => {

+                        console.log('error:' + err)

+                    })

+            };

+            //查询部门资料

+            $("#testInput").bind("input propertychange", function (event) {

+                var search = $("#testInput").val()

+                // console.log($("#testInput1").val())

+                timer && clearTimeout(timer);

+                timer = setTimeout(function () {

+                    getStr(search, '/dept/', 'testInput');

+

+                }, 600);

+            });

+            getStr('', '/dept/', 'testInput', 1);

+            // 点击新增时候灌装生产线资料获取

+            $("#testInput1").bind("input propertychange", function (event) {

+                var search = $("#testInput1").val()

+                // console.log($("#testInput1").val())

+                timer && clearTimeout(timer);

+                timer = setTimeout(function () {

+                    getStr(search, '/dept/', 'testInput1');

+

+                }, 600);

+            });

+

+            //查询单号

+            $("#testInput2").bind("input propertychange", function (event) {

+                var search = $("#testInput2").val()

+                // console.log($("#testInput1").val())

+                timer && clearTimeout(timer);

+                timer = setTimeout(function () {

+                    getStr(search, '/oddno/', 'testInput2');

 

+                }, 600);

+            });

+            getStr('', '/oddno/', 'testInput2', 1);

         });

     </script>

+ 297 - 0
meib/meib/templates/dessetting.html
파일 보기 

@@ -0,0 +1,297 @@
 
+<html lang="en">

+

+<head>

+    <meta charset="UTF-8">

+    <meta name="viewport" content="widtd=device-widtd, initial-scale=1.0">

+    <meta http-equiv="X-UA-Compatible" content="ie=edge">

+    <link rel="stylesheet" type="text/css" href="/static/css/bootstrap.min.css">

+    <link rel="stylesheet" type="text/css" href="/static/css/css.css">

+    <!-- 加载动画 -->

+    <link rel="stylesheet" type="text/css" href="/static/css/loader.css">

+    <link rel="stylesheet" type="text/css" href="/static/css/bootstrap-select.min.css">

+    <script src="/static/js/jquery.min.js"></script>

+    <script src="/static/js/bootstrap.min.js"></script>

+    <script src="/static/js/vue-2.4.0.js"></script>

+    <script src="/static/js/axios.min.js"></script>

+    <script src="/static/js/vue-Cookies.js"></script>

+    <script type="text/javascript" src="/static/js/jquery.select.js"></script>

+

+    <script src="/static/js/bootstrap-select_new.js"></script>

+

+

+    <title>Document</title>

+</head>

+

+<body>

+    <div id="app">

+        <div class="navbar navbar-default">

+            <div class="container">

+                <!-- navbar-header用于设置内容横向显示 -->

+                <div class="navbar-header">

+                    <a href="/index" class="navbar-brand"></a>

+                </div>

+                <!-- navbar-nav用来设置横向显示 -->

+                <!-- navbar-right用来设置右浮动 -->

+                <!-- hidden-xs用于当屏幕很小的情况下隐藏div里面的内容 -->

+                <div class="hidden-xs">

+                    <ul class="nav navbar-nav">

+                        <li class="dropdown">

+                            <!--订单一览表-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                订单一览表

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/index">订单一览表</a></li>

+                            </ul>

+                        </li>

+                        <li class="dropdown">

+                            <!--月度产能评估表-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                月度产能评估表

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/depps">月度产能评估表</a></li>

+                                <li><a href="/dessettingtm">车间标准产能设置</a></li>

+                            </ul>

+                        </li>

+                        <li class="dropdown">

+                            <!--月度主排程计划-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                月度主排程计划

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/depps">计划主交期</a></li>

+                                <li><a href="#">计划部门交期</a></li>

+                            </ul>

+                        </li>

+                        <li class="dropdown">

+                            <!--ie文件号管理-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                IE工艺文件号管理

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/iefiletm">新增IE工艺文件号</a></li>

+                                <li><a href="#">IE工艺文件号维护</a></li>

+                                <li><a href="#">IE效率明细表</a></li>

+                                <li><a href="#">IE效率统计表</a></li>

+                            </ul>

+                        </li>

+                    </ul>

+                    <ul class="nav navbar-nav navbar-right">

+                        <li v-if="username !=''">

+                            <a>{% verbatim %}{{ '欢迎'+username+'！！！' }} {% endverbatim %}</a>

+                        </li>

+                        <li v-else><a href="">请登录</a></li>

+                        <li><a href="/logout/" @click="logout()">退出登录</a></li>

+                    </ul>

+                </div>

+            </div>

+        </div>

+        <!--搜索-->

+        <div class="filter">

+            <div class="container ">

+                <label>

+                    <div class="navbar-nav">部门：</div>

+                    <div class="navbar-nav">

+                        <input class="input form-control" id="testInput" type="text"

+                            autocomplete="off" />

+                    </div>

+                </label>

+                <!-- <label class="save" @click="seek()">确定查询</label> -->

+                <label class="save def" id="def" @click="seek(1)">

+                    <div class="btn btn-primary navbar-nav">确定查询</div>

+                </label>

+            </div>

+        </div>

+        <!-- 内容 -->

+        <!-- container这个类是设置居中对齐 -->

+        <div class="container">

+            <!-- row这个类是用于设置取消内边距 -->

+            <table class="table table-bordered table-hover table-striped">

+                <tbody>

+                    <tr class="save" v-for="(item,i) in list" :key="item.dep"

+                        :class="i == activeIndex?'tr_active':''">

+                        <td v-if="i >0" width="50px" v-text="i"></td>

+                        <td v-else width="50px" v-text="'行号'"></td>

+                        <td width="50px" v-text="item.dep"></td>

+                        <td width="200px" v-text="item.dep_name"></td>

+                        <td width="50px" v-text="item.up_dd"></td>

+                        <td v-if="i >0" width="120px"><input type='number' min="0" class="input" v-model="item.s_capacity" /></td>

+                        <td v-else width="120px" v-text="item.s_capacity"></td>

+                        <td v-if="i >0" width="120px"><input type='number' min="0" class="input" v-model="item.s_d_staffing" /></td>

+                        <td v-else width="120px" v-text="item.s_d_staffing"></td>

+                        <td v-if="i >0" width="50px">

+                            <button class="btn btn-primary" @click="ok_save(item.dep,item.s_capacity,item.s_d_staffing,i)">保存</button></td>

+                        <td v-else width="50px" v-text="item.operation"></td>

+                    </tr>

+                </tbody>

+            </table>

+        </div>

+        <div class="footer refresh">

+            <div class="load">

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+            </div>

+        </div>

+    </div>

+    <script>

+        var vm = new Vue({

+            el: '#app',

+            data: {

+                activeIndex: 0,

+                dep:'',

+                list: [],

+                username: ''

+            },

+            mounted() {

+                // 获取登录名

+                // this.username=getCookie('username');

+                this.username = $cookies.get('username')

+                console.log($cookies.get('username'))

+            },

+            methods: {

+                seek(i) { // 添加的方法

+                    // console.log('ok')

+                    // 添加一个对象用于增加数据

+                    // 获取货品

+                    this.dep = $("#testInput").val()

+

+                    if (this.dep == undefined) {

+                        this.dep = ''

+                    }

+                    if (this.dep == null) {

+                        this.dep = ''

+                    }

+                    // 清空数据

+                    this.list = ''

+                    $(".refresh").show();

+                    axios.get('/dessetting', {

+                        params: {

+                            dep:this.dep

+                        },

+                    })

+                        .then(res => {

+                            this.list = res.data.data

+                            // console.log(this.list)

+                            $(".refresh").hide();

+                        })

+                        .catch(err => {

+                            console.log(err.response["data"] + err.response["status"])

+                        })

+                },

+                ok_save(dep, s_capacity, s_d_staffing, i) {

+                    // console.log('ok1')

+                    // console.log(OS_NO, PMC_DD, WH_REM, ITM)

+                    // this.activeIndex = i

+                    var dep = dep

+                    var s_capacity = s_capacity

+                    var s_d_staffing = s_d_staffing

+

+                    axios.put('/dessetting/', {

+                        data: {

+                            dep: dep,

+                            s_capacity: s_capacity,

+                            s_d_staffing: s_d_staffing,

+                        }

+                    })

+                        .then(res => {

+                            // alert(res.data)

+                            var data1 = res.data.code

+                            alert("修改成功")

+                        })

+                        .catch(err => {

+                            console.log('error:' + err)

+                        })

+

+                },

+                 //退出登录

+                logout() {

+                    console.log("qweq")

+                    axios.delete('/login/', {

+                        params: {

+                            user_1: this.user_1,

+                            pswd: this.pswd,

+                        }

+                    })

+                        .then(res => {

+

+                        })

+                        .catch(err => {

+                        })

+

+                },

+

+            },

+            created() {

+                    this.seek(2)

+                // this.select_cust()

+            }

+        });

+

+        $(function () {

+            // 开始写 jQuery 代码...

+            var timer = null;

+            // 定义一个公用的搜索接口

+            // console.log(vm.$data.list)

+            function getStr(n, url, field, clickif) {

+                //n为搜索的参数 url为请求的路由，filed是定位表单的id,

+                //clickif用于判断是否是第一次加载，如果不是第一次加载则需要模拟点击

+                var search = n

+                // 配置路由

+                if (typeof search === 'undefined') {

+                    search = ''

+                };

+                // console.log(search)

+                axios.get(url, {

+                    params: {

+                        search_no: search

+                    }

+                })

+                    .then(res => {

+                        // alert(res.data)

+                        var data1 = res.data.data

+                        datas = data1

+                        // console.log(datas)

+                        if (datas.length == 0) {

+                            alert("没有搜索到数据")

+                            return

+                        }

+                        $.selectSuggest(field, datas);

+                        // 是否第一次进入

+                        if (clickif !== 1) {

+                            $("#" + field).trigger("click");

+                        }

+                    })

+                    .catch(err => {

+                        console.log('error:' + err)

+                    })

+            };

+            //查询货品资料调用

+            $("#testInput").bind("input propertychange", function (event) {

+                var search = $("#testInput").val()

+                // console.log($("#testInput").val())

+                timer && clearTimeout(timer);

+                timer = setTimeout(function () {

+                    getStr(search, '/dept/', 'testInput');

+

+                }, 2000);

+            });

+            getStr('', '/dept/', 'testInput', 1);

+            

+        });

+    </script>

+    <!-- <script type="text/javascript" src="/static/js/export/jquery-1.8.2.js"></script> -->

+

+</body>

+

+</html>

+ 479 - 0
meib/meib/templates/iefile.html
파일 보기 

@@ -0,0 +1,479 @@
 
+<html lang="en">

+

+<head>

+    <meta charset="UTF-8">

+    <meta name="viewport" content="widtd=device-widtd, initial-scale=1.0">

+    <meta http-equiv="X-UA-Compatible" content="ie=edge">

+    <link rel="stylesheet" type="text/css" href="/static/css/bootstrap.min.css">

+    <link rel="stylesheet" type="text/css" href="/static/css/css.css">

+    <link rel="stylesheet" type="text/css" href="/static/css/iefile.css">

+    <!-- 加载动画 -->

+    <link rel="stylesheet" type="text/css" href="/static/css/loader.css">

+    <link rel="stylesheet" type="text/css" href="/static/css/bootstrap-select.min.css">

+    <script src="/static/js/jquery.min.js"></script>

+    <script src="/static/js/bootstrap.min.js"></script>

+    <script src="/static/js/vue-2.4.0.js"></script>

+    <script src="/static/js/axios.min.js"></script>

+    <script src="/static/js/vue-Cookies.js"></script>

+    <script type="text/javascript" src="/static/js/jquery.select.js"></script>

+

+    <script src="/static/js/bootstrap-select_new.js"></script>

+    <!-- 图标js -->

+    <!-- <script src="/static/js/ionicons.js"></script> -->

+

+    <title>Document</title>

+</head>

+

+<body>

+    <div id="app">

+        <div class="navbar navbar-default">

+            <div class="container">

+                <!-- navbar-header用于设置内容横向显示 -->

+                <div class="navbar-header">

+                    <a href="/index" class="navbar-brand"></a>

+                </div>

+                <!-- navbar-nav用来设置横向显示 -->

+                <!-- navbar-right用来设置右浮动 -->

+                <!-- hidden-xs用于当屏幕很小的情况下隐藏div里面的内容 -->

+                <div class="hidden-xs">

+                    <ul class="nav navbar-nav">

+                        <li class="dropdown">

+                            <!--订单一览表-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                订单一览表

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/index">订单一览表</a></li>

+                            </ul>

+                        </li>

+                        <li class="dropdown">

+                            <!--月度产能评估表-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                月度产能评估表

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/depps">月度产能评估表</a></li>

+                                <li><a href="/dessettingtm">车间标准产能设置</a></li>

+                            </ul>

+                        </li>

+                        <li class="dropdown">

+                            <!--月度主排程计划-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                月度主排程计划

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/depps">计划主交期</a></li>

+                                <li><a href="#">计划部门交期</a></li>

+                            </ul>

+                        </li>

+                        <li class="dropdown">

+                            <!--ie文件号管理-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                IE工艺文件号管理

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/iefiletm">新增IE工艺文件号</a></li>

+                                <li><a href="#">IE工艺文件号维护</a></li>

+                                <li><a href="#">IE效率明细表</a></li>

+                                <li><a href="#">IE效率统计表</a></li>

+                            </ul>

+                        </li>

+                    </ul>

+                    <ul class="nav navbar-nav navbar-right">

+                        <li v-if="username !=''">

+                            <a>{% verbatim %}{{ '欢迎'+username+'！！！' }} {% endverbatim %}</a>

+                        </li>

+                        <li v-else><a href="">请登录</a></li>

+                        <li><a href="/logout/" @click="logout()">退出登录</a></li>

+                    </ul>

+                </div>

+            </div>

+        </div>

+        <!--表头-->

+        <div class="filter">

+            <div class="container ">

+                <table class="table">

+                    <tbody>

+                        <tr>

+                            <td class="align_right">收件日期：</td>

+                            <td class="align_left"><input type="date" v-model="da_date"></td>

+                            <td class="align_right">IE工艺文件编号：</td>

+                            <td class="align_left"><input type="text" v-model="file_serial" autocomplete="off"></td>

+                            <td class="align_right">工段名称：</td>

+                            <td class="align_left"><input type="text" v-model="workshop_name" autocomplete="off"></td>

+                            <td class="align_right">系统输单号：</td>

+                            <td class="align_left"><input type="text" v-model="iefile_no" disabled="disabled"></td>

+                        </tr>

+                        <tr>

+                            <td class="align_right">1小时管理费用（元/小时）：</td>

+                            <td class="align_left"><input type="number" v-model="hr_up" min="0"></td>

+                            <td class="align_right">标准总人力（人）：</td>

+                            <td class="align_left"><input type="number" v-model="total_manpower" min="0"></td>

+                            <td class="align_right">瓶颈时间（秒）：</td>

+                            <td class="align_left"><input type="number" v-model="point" min="0"></td>

+                            <td class="align_right">输单电脑：</td>

+                            <td class="align_left"><input type="text" v-model="username" disabled="disabled"></td>

+                            

+                        </tr>

+                        <tr>

+                            <td class="align_right">文件标注单价：</td>

+                            <td class="align_left"><input type="number" v-model="postil_up" min="0"></td>

+                            <td class="align_right">作业线体：</td>

+                            <td class="align_left"><input type="text" id="dept" autocomplete="off"></td>

+                            <td class="align_right">作业时间（秒）：</td>

+                            <td class="align_left"><input type="number" v-model="job_time" min="0"></td>

+                            <td class="align_right">输单日期：</td>

+                            <td colspan="3" class="align_left"><input type="data" v-model="sys_date"

+                                    disabled="disabled"></td>

+                        </tr>

+                        <tr>

+                            <td class="align_right">文件备注：</td>

+                            <td colspan="5" class="align_left">

+                                <textarea rows="2" cols="150" v-model="rem"></textarea>

+                            </td>

+                        </tr>

+                    </tbody>

+                </table>

+            </div>

+        </div>

+        <!-- 内容 -->

+        <!-- container这个类是设置居中对齐 -->

+        <div class="container">

+            <div class="Watch_body">

+                <div class="navbar-left container_left">

+                    <ul class="list-unstyled">

+                        <li>

+                            <p class="itm_left left_float">BOM配方号</p>

+                            <p class="itm_right left_float">

+                                <button class="btn btn-primary navbar-nav" data-toggle="modal"

+                                    data-target="#myModal">新增</button>

+                            </p>

+                        </li>

+                        <li v-for="(item,i) in list_bom" :key="i">

+                            <p class="itm_left left_float"><input type="text" v-model="item.BOM"></p>

+                            <p class="itm_right left_float"><button class="btn btn-primary navbar-nav"

+                                    @click="bom_del(i,item.IEFILE_NO,item.BOM,ITEM.ITM)">删除</button></p>

+                        </li>

+                    </ul>

+                </div>

+                <div class="navbar-left container_right">

+                    <ul class="list-unstyled">

+                        <li>

+                            <p class="itm_left left_float text-center">文本标注阶梯单价（元）</p>

+                            <p class="itm_right left_float text-center"><button

+                                    class="btn btn-primary navbar-nav" @click=confirmqty()>新增</button></p>

+                        </li>

+                        <li v-for="(item,i) in list_qty" :key="i">

+                            <p class="itm_left left_float text-center"><input type="number" min="0" v-model="item.QTY"></p>

+                            <p class="itm_right left_float text-center"><input type="number" min="0" v-model="item.UP"></p>

+                            <p class="itm_del left_float text-center"><button

+                                    class="btn btn-primary navbar-nav" @click="qty_del(i,item.IEFILE_NO,item.ITM)">删除</button></p>

+                        </li>

+                    </ul>

+                </div>

+            </div>

+        </div>

+        <div class="footer container footer_base">

+            <div class="hidden-xs">

+                <button class="btn btn-primary navbar-nav">新增</button>

+                <button class="btn btn-primary navbar-nav save_ok" @click=newly()>保存</button>

+                <button class="btn btn-primary navbar-nav">修改</button>

+                <button class="btn btn-primary navbar-nav">删除</button>

+            </div>

+        </div>

+        <div class="modal fade" id="myModal">

+            <div class="modal-dialog">

+                <div class="modal-content" style="width: 50%;">

+                    <div class="modal-header">

+                        <div class="modal-title" id="uppswd">选择BOM配方号</div>

+                    </div>

+                    <div class="modal-body" style="height: 150px;">

+                        <div class="form-group">

+                            <div style="height: 60px;background-color: #dff0d8;">

+                                <div class="alert alert-success sousuo" id="sousuo">成功提交！数据搜索中。</div>

+                            </div>

+                            <label for="bom">BOM配方号</label>

+                            <input type="text" class="form-control" id="bom" autocomplete="off">

+                        </div>

+                    </div>

+                    <div class="modal-footer">

+                        <button class="btn btn-primary" data-dismiss="modal" @click="confirmbom()">确定</button>

+                        <button class="btn btn-primary" data-dismiss="modal">取消</button>

+                    </div>

+                </div>

+            </div>

+        </div>

+        <div class="footer refresh">

+            <div class="load">

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+                <span></span>

+            </div>

+        </div>

+    </div>

+    <script>

+        var vm = new Vue({

+            el: '#app',

+            data: {

+                activeIndex: 0,

+                list_bom: [],  //BOM配方

+                list_qty: [],  //阶梯单价

+                iefile_no: '',  //系统输单号

+                hr_up: 0,  //1小时管理费用（元/小时）

+                da_date: '',  //收件日期

+                postil_up: 0,  //文件批注单价

+                rem: '',  //文件备注

+                file_serial: '', //IE工艺文件编号

+                total_manpower: 0, //标准总人力(人)

+                workshop_name: '', //工段名称

+                point: 0,  //瓶颈时间（秒）

+                dep: '',  //作业线体

+                dep_name: '',  //部门名称

+                job_time: 0,  //作业时间（秒）

+                username: '',  //输单电脑

+                sys_date: '',  //输单日期

+            },

+            mounted() {

+                // 获取登录名

+                // this.username=getCookie('username');

+                this.username = $cookies.get('username')

+                console.log($cookies.get('username'))

+            },

+            methods: {

+                seek(i) { // 添加的方法

+                    // console.log('ok')

+                    // 添加一个对象用于增加数据

+                    // 获取货品

+                    this.dep = $("#testInput").val()

+

+                    if (this.dep == undefined) {

+                        this.dep = ''

+                    }

+                    if (this.dep == null) {

+                        this.dep = ''

+                    }

+                    // 清空数据

+                    this.list = ''

+                    $(".refresh").show();

+                    axios.get('/dessetting', {

+                        params: {

+                            dep: this.dep

+                        },

+                    })

+                        .then(res => {

+                            this.list = res.data.data

+                            // console.log(this.list)

+                            $(".refresh").hide();

+                        })

+                        .catch(err => {

+                            console.log(err.response["data"] + err.response["status"])

+                        })

+                },

+                // 新增单据

+                newly() {

+                    console.log("新增")

+                    // 获取作业线体

+                    this.dep = $("#dept").val()

+                    axios.post('/iefile/', {

+                        data: {

+                            hr_up: this.hr_up, //1小时管理费用（元/小时）

+                            da_date: this.da_date,  //收件日期

+                            postil_up:this.postil_up,  //文件批注单价

+                            rem: this.rem,  //文件备注

+                            file_serial: this.file_serial, //IE工艺文件编号

+                            total_manpower: this.total_manpower, //标准总人力(人)

+                            workshop_name: this.workshop_name, //工段名称

+                            point: this.point,  //瓶颈时间（秒）

+                            dep: this.dep,  //作业线体

+                            job_time: this.job_time,  //作业时间（秒）

+                            username: this.username,  //输单电脑

+                            sys_date: this.sys_date,  //输单日期

+                            list_bom:this.list_bom,   //bom配方号

+                            list_qty:this.list_qty  //阶梯单价

+                        }

+                    })

+                        .then(res => {

+                            // alert(res.data)

+                            var data1 = res.data

+                            this.iefile_no = data1.data

+                            // 设置保存按钮为禁止

+                            $(".save").attr("disabled", "disabled");

+                            console.log("新增成功")

+                        })

+                        .catch(err => {

+                            console.log(err.response["data"] + err.response["status"])

+                        })

+                },

+                // 删除BOM行

+                bom_del(i,IEFILE_NO,BOM,ITM) {

+                    // this.add_date.$remove(i);

+                    console.log(IEFILE_NO)

+                    console.log(BOM)

+                    this.list_bom.splice(i, 1);

+                    console.log(this.list_bom)

+                    // axios.delete('/depmacf/', {

+                    //     data: {

+                    //         dep: dep,

+                    //         no:no,

+                    //         itm:itm,

+                    //         data:data

+                    //     }

+                    // })

+                    //     .then(res => {

+                    //         // alert(res.data)

+                    //         console.log("删除成功")

+                    //         if(data!==''){

+                    //             this.data_list='';

+                    //         }

+                    //         else{

+                    //             this.data_list.splice(i, 1);

+                    //         }

+                    //     })

+                    //     .catch(err => {

+                    //         alert(err.response["data"] + err.response["status"])

+                    //     })

+                },

+                // 删除qty行

+                qty_del(i,IEFILE_NO,ITM){

+                    this.list_qty.splice(i, 1);

+                    console.log(this.list_qty)

+                },

+                // 新增一行BOM

+                confirmbom(){

+                    var bom = $("#bom").val().split("--")[0];

+                    console.log(bom)

+                    console.log(bom[0])

+                    var bom_itm = {"BOM":bom}

+                    this.list_bom.push(bom_itm)

+                    console.log(this.list_bom)

+                },

+                // 新增阶梯单价一行

+                confirmqty(){

+                    this.list_qty.push({"QTY":0,"UP":0})

+                },

+                //获取当前日期

+                addDate() {

+                    var date = new Date();

+                    var seperator1 = "-";

+                    var year = date.getFullYear();

+                    var month = date.getMonth() + 1;

+                    var strDate = date.getDate();

+                    if (month >= 1 && month <= 9) {

+                        month = "0" + month;

+                    }

+                    if (strDate >= 0 && strDate <= 9) {

+                        strDate = "0" + strDate;

+                    }

+                    var currentdate = year + seperator1 + month + seperator1 + strDate;

+                    // console.log(currentdate)

+                    this.da_date = this.sys_date = currentdate

+                },

+                //退出登录

+                logout() {

+                    console.log("qweq")

+                    axios.delete('/login/', {

+                        params: {

+                            user_1: this.user_1,

+                            pswd: this.pswd,

+                        }

+                    })

+                        .then(res => {

+

+                        })

+                        .catch(err => {

+                        })

+

+                },

+

+            },

+            created() {

+                this.addDate()

+                this.seek(2)

+                $("#sousuo").hide();

+                // this.select_cust()

+            }

+        });

+

+        $(function () {

+            // 开始写 jQuery 代码...

+            var timer = null;

+            // 定义一个公用的搜索接口

+            // console.log(vm.$data.list)

+            function getStr(n, url, field, clickif) {

+                //n为搜索的参数 url为请求的路由，filed是定位表单的id,

+                //clickif用于判断是否是第一次加载，如果不是第一次加载则需要模拟点击

+

+                var search = n

+                // 配置路由

+                if (typeof search === 'undefined') {

+                    search = ''

+                };

+                // console.log(search)

+                axios.get(url, {

+                    params: {

+                        search_no: search

+                    }

+                })

+                    .then(res => {

+                        // alert(res.data)

+                        var data1 = res.data.data

+                        datas = data1

+                        // console.log(datas)

+                        if (datas.length == 0) {

+                            alert("没有搜索到数据")

+                            return

+                        }

+                        $.selectSuggest(field, datas);

+                        $("#sousuo").hide();

+                        // console.log("ok")

+                        // setTimeout(function () {

+                        //     $.selectSuggest(field, datas);

+                        // }, 1000);

+                        // 是否第一次进入

+                        if (clickif !== 1) {

+                            $("#" + field).trigger("click");

+                        }

+                    })

+                    .catch(err => {

+                        console.log('error:' + err)

+                    })

+            };

+            //查询BOM资料调用

+            $("#bom").bind("input propertychange", function (event) {

+                var search = $("#bom").val()

+                // console.log($("#testInput").val())

+                timer && clearTimeout(timer);

+                timer = setTimeout(function () {

+                    // $("#sousuo").hide();

+                    $("#sousuo").show();

+                    getStr(search, '/bom/', 'bom');

+

+                }, 1000);

+            });

+            //查询部门资料调用

+            $("#dept").bind("input propertychange", function (event) {

+                var search = $("#bom").val()

+                // console.log($("#testInput").val())

+                timer && clearTimeout(timer);

+                timer = setTimeout(function () {

+                    getStr(search, '/dept/', 'dept');

+

+                }, 1000);

+            });

+            getStr('', '/dept/', 'dept', 1);

+        });

+    </script>

+    <!-- <script type="text/javascript" src="/static/js/export/jquery-1.8.2.js"></script> -->

+

+</body>

+

+</html>

+ 118 - 176
meib/meib/templates/order.html
파일 보기 

@@ -13,12 +13,11 @@
 
     <script src="/static/js/bootstrap.min.js"></script>

     <script src="/static/js/vue-2.4.0.js"></script>

     <script src="/static/js/axios.min.js"></script>

+    <!-- 用户操作cookie -->

     <script src="/static/js/vue-Cookies.js"></script>

+    <!-- 下拉搜索插件 -->

     <script type="text/javascript" src="/static/js/jquery.select.js"></script>

-

     <script src="/static/js/bootstrap-select_new.js"></script>

-

-

     <title>Document</title>

 </head>

 

@@ -43,7 +42,6 @@
 
                             </a>

                             <ul class="nav dropdown-menu">

                                 <li><a href="/index">订单一览表</a></li>

-                                <li><a href="#">已结案订单</a></li>

                             </ul>

                         </li>

                         <li class="dropdown">

@@ -53,8 +51,8 @@
 
                                 <b class="caret"></b>

                             </a>

                             <ul class="nav dropdown-menu">

-                                <li><a href="#">汇总分析</a></li>

-                                <li><a href="#">订单完成情况</a></li>

+                                <li><a href="/depps">月度产能评估表</a></li>

+                                <li><a href="/dessettingtm">车间标准产能设置</a></li>

                             </ul>

                         </li>

                         <li class="dropdown">

@@ -68,9 +66,22 @@
 
                                 <li><a href="#">计划部门交期</a></li>

                             </ul>

                         </li>

+                        <li class="dropdown">

+                            <!--ie文件号管理-->

+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">

+                                IE工艺文件号管理

+                                <b class="caret"></b>

+                            </a>

+                            <ul class="nav dropdown-menu">

+                                <li><a href="/iefiletm">新增IE工艺文件号</a></li>

+                                <li><a href="#">IE工艺文件号维护</a></li>

+                                <li><a href="#">IE效率明细表</a></li>

+                                <li><a href="#">IE效率统计表</a></li>

+                            </ul>

+                        </li>

                     </ul>

                     <ul class="nav navbar-nav navbar-right">

-                        <li v-if="username !=''"> 

+                        <li v-if="username !=''">

                             <a>{% verbatim %}{{ '欢迎'+username+'！！！' }} {% endverbatim %}</a>

                         </li>

                         <li v-else><a href="">请登录</a></li>

@@ -94,15 +105,13 @@
 
                 <label>

                     <div class="navbar-nav">品名：</div>

                     <div class="navbar-nav">

-                        <input class="input form-control" id="testInput" type="text" v-model="prd_no"

-                            autocomplete="off" />

+                        <input class="input form-control" id="testInput" type="text" autocomplete="off" />

                     </div>

                 </label>

                 <label>

                     <div class="navbar-nav">客户：</div>

                     <div class="navbar-nav">

-                        <input class="input form-control" id="testInput1" type="text" v-model="cust_cus_no"

-                            autocomplete="off" />

+                        <input class="input form-control" id="testInput1" type="text" autocomplete="off" />

                     </div>

                 </label>

                 <label>

@@ -165,14 +174,17 @@
 
                                                 </select>

                                             </td>

                                             <td><span class="navbar-nav filtrate_w">生产部门：</span>

-                                                <select class="selectpicker form-control filtrate"

-                                                    data-live-search="true" id="field1"></select></td>

+                                                <input class="input form-control filtrate" id="testInput2" type="text"

+                                                    autocomplete="off" />

+                                            </td>

                                         </tr>

                                         <tr>

                                             <td><span class="navbar-nav filtrate_w">容器：</span>

-                                                <input type="text" class="navbar-nav filtrate" v-model="vessel"></td>

+                                                <input type="text" class="input form-control filtrate" v-model="vessel">

+                                            </td>

                                             <td><span class="navbar-nav filtrate_w">容量：</span>

-                                                <input type="text" class="navbar-nav filtrate" v-model="capacity"></td>

+                                                <input type="text" class="input form-control filtrate"

+                                                    v-model="capacity"></td>

                                         </tr>

                                     </table>

                                 </div>

@@ -228,8 +240,9 @@
 
                             <textarea rows="1" cols="10" v-model="item.WH_REM"></textarea>

                         </td>

                         <td v-else width="110px" v-text="item.WH_REM"></td>

-                        <td v-if="i >0" width="50px"><input type='submit' class="save"

-                                @click="ok_save(item.OS_NO,item.PMC_DD,item.WH_REM,item.ITM,i)" value="保存" /></td>

+                        <td v-if="i >0" width="50px"><button class="btn btn-primary"

+                                @click="ok_save(item.OS_NO,item.PMC_DD,item.WH_REM,item.ITM,i)" value="保存">保存</button>

+                        </td>

                         <td v-else width="50px" v-text="item.operation"></td>

                     </tr>

                 </tbody>

@@ -315,7 +328,8 @@
 
                 emptypage() {

                     this.page = 1

                 },

-                async seek(i) { // 添加的方法

+                // 查询数据

+                seek(i) { // 添加的方法

                     // console.log('ok')

                     // 添加一个对象用于增加数据

                     // 获取货品

@@ -325,24 +339,14 @@
 
                     this.cust_cus_no = $("#testInput1").val()

                     // console.log(this.cust_cus_no)

                     //处理部门

-                    if ($("#field1").selectpicker('val') != '') {

-                        this.sc_dep_aa = $("#field1").selectpicker('val')

-                        this.sc_dep = $("#field1").selectpicker('val')

-                    }

-

-                    if ($("#field1").selectpicker('val') == '') {

-                        this.sc_dep = this.sc_dep_aa

-                    }

+                    console.log($("#testInput2").val())

+                    this.sc_dep = $("#testInput2").val()

                     // 清空数据

                     this.list = ''

                     $(".page").hide();

                     $(".refresh").show();

                     // 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 }

-                    //当第一次进入时设置客户编码值为空

-                    // if (this.cust_cus_no == null) {

-                    //     this.cust_cus_no = ''

-                    // }

                     //当第一次进入时设置部门编码值为空

                     if (this.sc_dep == null) {

                         this.sc_dep = ''

@@ -378,8 +382,7 @@
 
                                 return

                             }

                             var data1 = res.data.data

-                            this.aaa = data1

-                            this.list = this.aaa

+                            this.list = data1

                             // 设置总页数

                             this.total_page = res.data.total_page

                             this.total_count = res.data.total_count

@@ -407,8 +410,8 @@
 
                             console.log('error:' + err)

                         })

                 },

-

-                async ok_save(OS_NO, PMC_DD, WH_REM, ITM, i) {

+                // 保存数据

+                ok_save(OS_NO, PMC_DD, WH_REM, ITM, i) {

                     // console.log('ok1')

                     // console.log(OS_NO, PMC_DD, WH_REM, ITM)

                     // this.activeIndex = i

@@ -425,162 +428,90 @@
 
                             ITM: ITM

                         }

                     })

-                        .then(res => {

+                      .then(res => {

                             // alert(res.data)

                             var data1 = res.data.data

+                            alert("保存成功")

                         })

                         .catch(err => {

                             console.log('error:' + err)

                         })

 

                 },

-                // 修改list数据

-                async uplist() {

-                    // console.log('ok2')

-                    axios.get('/listtb', {

-                        params: {

-                            st_time: '',

-                            sh_time: '',

-                            cus_no: '',

-                            cls_id: '',

-                            pmc_ok: '',

-                            sort: ''

-                        }

-                    })

-                        .then(res => {

-                            // alert(res.data)

-                            var data1 = res.data.data

-                            // console.log(typeof(data1))

-                            // console.log(typeof(list))

-

-                            this.list = data1

-                            $(".footer").hide();

-                            // console.log(this.list)

-                        })

-                        .catch(err => {

-                            console.log('error:' + err)

-                        })

-                },

-                //获取当前日期

-                async addDate() {

-                    var date = new Date();

-                    var seperator1 = "-";

-                    var year = date.getFullYear();

-                    var month = date.getMonth() + 1;

-                    var strDate = date.getDate();

-                    if (month >= 1 && month <= 9) {

-                        month = "0" + month;

-                    }

-                    if (strDate >= 0 && strDate <= 9) {

-                        strDate = "0" + strDate;

-                    }

-                    var currentdate = year + seperator1 + month + seperator1 + strDate;

-                    // console.log(currentdate)

-                    this.st_time = this.sh_time = currentdate

-                },

-                async select_prd_no() {

-                    console.log(1111)

-                    $.selectSuggest('testInput', this.datas);

-                },

-                //获取客户资料

-                async select_cust() {

-                    axios.get('/cust/', {

-                        // params: {

-                        //     st_time: '',

-                        //     sh_time: '',

-                        //     cus_no: '',

-                        //     cls_id: '',

-                        //     pmc_ok: '',

-                        // }

-                    })

-                        .then(res => {

-                            // alert(res.data)

-                            var data1 = res.data.data

-                            this.list_cust = data1

-                            // console.log(this.list_cust)

-                            // 设置下拉搜索

-                            var tempIdStr = '<option  value="">选择客户</option>';

-                            // var tempIdStr = '<option  value="' + this.list[0]['DEP'] + '" v-bind:value="DEP_DEP">' + this.list[0]['DEP'] + '---' + this.list[0]['DEP'] + '</option>';

-                            $("#field").append(tempIdStr);

-                            $.each(this.list_cust, function (i, item) {

-                                var tempId = '<option  value="' + item.CUS_NO + '" v-bind:value="cust_cus_no">' + item.CUS_NO + '---' + item.NAME + '</option>';

-                                $("#field").append(tempId);

-                                // alert(tempId)

-                            });

-                            // 更新 。 这一步很重要

-                            $('#field').selectpicker('refresh');

-

-                            //  $('#field').selectpicker('refresh');

-

-                        })

-                        .catch(err => {

-                            console.log('error:' + err)

+                    // 修改list数据

+                    uplist() {

+                        // console.log('ok2')

+                        axios.get('/listtb', {

+                            params: {

+                                st_time: '',

+                                sh_time: '',

+                                cus_no: '',

+                                cls_id: '',

+                                pmc_ok: '',

+                                sort: ''

+                            }

                         })

-                },

-                //获取部门资料

-                async select_dep() {

-                    axios.get('/dept/', {

-                        // params: {

-                        //     st_time: '',

-                        //     sh_time: '',

-                        //     cus_no: '',

-                        //     cls_id: '',

-                        //     pmc_ok: '',

-                        // }

-                    })

-                        .then(res => {

-                            // alert(res.data)

-                            var data1 = res.data.data

-                            this.list_dep = data1

-                            // console.log(this.list)

-                            // 设置下拉搜索

-                            var tempIdStr = '<option  value="">选择部门</option>';

-                            // var tempIdStr = '<option  value="' + this.list[0]['DEP'] + '" v-bind:value="DEP_DEP">' + this.list[0]['DEP'] + '---' + this.list[0]['DEP'] + '</option>';

-                            $("#field1").append(tempIdStr);

-                            $.each(this.list_dep, function (i, item) {

-                                var tempId = '<option  value="' + item.DEP + '" v-bind:value="sc_dep">' + item.DEP + '---' + item.DEP_NAME + '</option>';

-                                $("#field1").append(tempId);

-                                // alert(tempId)

-                            });

-                            // 更新 。 这一步很重要

-                            $('#field1').selectpicker('refresh');

+                            .then(res => {

+                                // alert(res.data)

+                                var data1 = res.data.data

+                                // console.log(typeof(data1))

+                                // console.log(typeof(list))

 

-                        })

-                        .catch(err => {

-                            console.log('error:' + err)

-                        })

-                },

-                //退出登录

-                logout() {

-                    console.log("qweq")

-                    axios.delete('/login/', {

-                        params: {

-                            user_1: this.user_1,

-                            pswd: this.pswd,

+                                this.list = data1

+                                $(".footer").hide();

+                                // console.log(this.list)

+                            })

+                            .catch(err => {

+                                console.log('error:' + err)

+                            })

+                    },

+                    //获取当前日期

+                    addDate() {

+                        var date = new Date();

+                        var seperator1 = "-";

+                        var year = date.getFullYear();

+                        var month = date.getMonth() + 1;

+                        var strDate = date.getDate();

+                        if (month >= 1 && month <= 9) {

+                            month = "0" + month;

                         }

-                    })

-                        .then(res => {

-

-                        })

-                        .catch(err => {

+                        if (strDate >= 0 && strDate <= 9) {

+                            strDate = "0" + strDate;

+                        }

+                        var currentdate = year + seperator1 + month + seperator1 + strDate;

+                        // console.log(currentdate)

+                        this.st_time = this.sh_time = currentdate

+                    },

+                    //退出登录

+                    logout() {

+                        console.log("qweq")

+                        axios.delete('/login/', {

+                            params: {

+                                user_1: this.user_1,

+                                pswd: this.pswd,

+                            }

                         })

+                            .then(res => {

+

+                            })

+                            .catch(err => {

+                            })

 

+                    },

+                    // 导出数据

+                    exportaa() {

+                        console.log(this.list)

+                        var filter = [];

+                        var title = [];

+                        exportExcel(this.list, '订单一览表数据', title, filter);

+                    }

                 },

-                // 导出数据

-                exportaa() {

-                    console.log(this.list)

-                    var filter = [];

-                    var title = [];

-                    exportExcel(this.list, '订单一览表数据', title, filter);

-                }

-            },

-            created() {

-                setTimeout(() => {

-                    this.seek(2)

-                }, 0)

-                this.select_dep()

-                this.addDate()

-                // this.select_cust()

+                    created() {

+                        setTimeout(() => {

+            this.seek(2)

+        }, 0)

+        // this.select_dep()

+        this.addDate()

             }

         });

 

@@ -644,6 +575,17 @@
 
                 }, 2000);

             });

             getStr('', '/cust/', 'testInput1', 1);

+            //查询部门资料

+            $("#testInput2").bind("input propertychange", function (event) {

+                var search = $("#testInput2").val()

+                // console.log($("#testInput1").val())

+                timer && clearTimeout(timer);

+                timer = setTimeout(function () {

+                    getStr(search, '/dept/', 'testInput2');

+

+                }, 600);

+            });

+            // getStr('', '/dept/', 'testInput2', 1);

         });

     </script>

     <!-- <script type="text/javascript" src="/static/js/export/jquery-1.8.2.js"></script> -->

+ 18 - 142
meib/meib/templates/text.html
파일 보기 

@@ -53,152 +53,28 @@
 
 </head>

 

 <body>

-    <div class="hiprint-printTemplate">

-        <div class="hiprint-printPanel panel-index-0">

-            <style printstyle="">

-                @page {

-                    border: 0;

-                    padding: 0cm;

-                    margin: 0cm;

-                    size: A4 portrait;

-                }

-            </style>

-            <div class="hiprint-printPaper" original-height="297" style="width: 210mm; height: 296mm;">

-                <div class="hiprint-printPaper-content">

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 107pt; height: 42pt; font-size: 19pt; font-weight: 700; text-align: center; line-height: 39pt; left: 20pt; top: 25pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">黄磊</div>

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 165pt; height: 13pt; left: 390pt; top: 35pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">邮箱：hinnn.com@gmail.com</div>

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 165pt; height: 13pt; left: 390pt; top: 55pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">地址：北京朝阳区二道口</div>

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 165pt; height: 13pt; left: 390pt; top: 75pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">电话：18888888888</div>

-                    </div>

-                    <div class="hiprint-printElement hiprint-printElement-hline"

-                        style="border-width: 0.75pt; position: absolute; width: 573pt; height: 10pt; left: 10pt; top: 110pt;">

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 27pt; height: 13pt; text-align: center; left: 20pt; top: 135pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">目标</div>

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 562pt; height: 13pt; font-size: 13pt; left: 20pt; top: 160pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">产品数据分析师</div>

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 29pt; height: 13pt; text-align: center; left: 20pt; top: 195pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">教育</div>

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 561pt; height: 17pt; font-size: 12pt; font-weight: 600; line-height: 17pt; left: 20pt; top: 230pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">信息管理与信息系统</div>

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 561pt; height: 15pt; font-weight: 600; left: 20pt; top: 255pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">北京邮电大学</div>

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 120pt; height: 13pt; left: 20pt; top: 280pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">北京朝阳区二道口</div>

-                    </div>

-                    <div tabindex="1" class="hiprint-printElement hiprint-printElement-text"

-                        style="position: absolute; width: 120pt; height: 13pt; left: 20pt; top: 305pt;">

-                        <div class="hiprint-printElement-text-content hiprint-printElement-content"

-                            style="height:100%;width:100%">时间：2010</div>

-                    </div>

-                    <div class="hiprint-printElement hiprint-printElement-longText"

-                        style="position: absolute; width: 561pt; left: 20pt; top: 345pt;">

-                        <div class="hiprint-printElement-longText-content hiprint-printElement-content"

-                            style="height:100%;width:100%"><span

-                                class="long-text-indent"></span>技能：MYSQL,HIVE(数据仓库工具),SPSS(统计产品已服务解决方案),数据挖掘，跨部门沟通能力，业务理解能力，数据解读分析。

-                        </div>

-                    </div>

-                    <div class="hiprint-printElement hiprint-printElement-table"

-                        style="position: absolute; width: 559pt; left: 20pt; top: 389.75pt;">

-                        <div class="hiprint-printElement-table-handle"></div>

-                        <div class="hiprint-printElement-table-content" style="height:100%;width:100%">

-                            <div class="hi-grid-row table-grid-row">

-                                <div class="tableGridColumnsGutterRow hi-grid-col" style="width:100%;">

-                                    <table class="hiprint-printElement-tableTarget" style="border-collapse: collapse;">

-                                        <thead>

-                                            <tr>

-                                                <td id="15" column-id="position" haswidth="haswidth"

-                                                    style="text-align: center; width: 93.1667pt;">职位</td>

-                                                <td id="16" column-id="company" haswidth="haswidth"

-                                                    style="text-align: center; width: 93.1667pt;">公司</td>

-                                                <td id="17" column-id="address" haswidth="haswidth"

-                                                    style="text-align: center; width: 93.1667pt;">地点</td>

-                                                <td id="18" column-id="date" haswidth="haswidth"

-                                                    style="text-align: center; width: 93.1667pt;">时间</td>

-                                                <td id="19" column-id="work" haswidth="haswidth"

-                                                    style="text-align: center; width: 186.333pt;">主要工作</td>

-                                            </tr>

-                                        </thead>

-                                        <tbody>

-                                            <tr>

-                                                <td field="position" style="text-align: center;">数据分析师</td>

-                                                <td field="company" style="text-align: center;">某宝</td>

-                                                <td field="address" style="text-align: center;">北京</td>

-                                                <td field="date" style="text-align: center;">四月-2010-八月-2011</td>

-                                                <td field="work" style="text-align: center;">

-                                                    专题分析/模型，根据业务分析分析各类专题，例如：商品等级，会员消费行为营销活动，重要产品数据等。</td>

-                                            </tr>

-                                            <tr>

-                                                <td field="position" style="text-align: center;">数据分析师</td>

-                                                <td field="company" style="text-align: center;">某东</td>

-                                                <td field="address" style="text-align: center;">北京</td>

-                                                <td field="date" style="text-align: center;">九月-2011-三月-2016</td>

-                                                <td field="work" style="text-align: center;">

-                                                    数据指标监控，根据产品，运营以及管理的需求，针对产品数据，运营，业务进展及KPI指标的监控，经营分析，对口BU的经营报告，分析KPI进度，交易产品异动原因，分析市场动态，汇报对象为BU经理。

-                                                </td>

-                                            </tr>

-                                            <tr>

-                                                <td field="position" style="text-align: center;">数据产品经理</td>

-                                                <td field="company" style="text-align: center;">大米</td>

-                                                <td field="address" style="text-align: center;">北京</td>

-                                                <td field="date" style="text-align: center;">四月-2016-至今</td>

-                                                <td field="work" style="text-align: center;">

-                                                    负责具体分析项目，例如实时监控，数据后台管理，协调开发资源，控制项目进度。</td>

-                                            </tr>

-                                        </tbody>

-                                    </table>

-                                </div>

-                            </div>

-                        </div>

-                    </div><span class="hiprint-paperNumber"

-                        style="position: absolute; top: 819pt; left: 565pt;">1-1</span>

-                </div>

-            </div>

-        </div>

+    <div id="d1">

+        <p id="pgv">进度：0%</p>

+        <progress id="pg" max="100" value="0"></progress>

     </div>

-    <input type="button" onclick=" print()" value="打印">

 </body>

 <script language="javascript">

-    function print() {

-        $("#print-area").jqprint({

-            debug: false,

-            importCSS: true,

-            printContainer: true,

-            operaSupport: false

-        });

+    function staticProgress() {

+        var pg = document.getElementById('pg')

+        var pgv = document.getElementById('pgv')

+        pg.max=1000

+        var timer = setInterval(function () {

+            if (pg.value !== 1000) {

+                pg.value++

+                pgv.innerHTML = '进度：' + pg.value + '%'

+            } else {

+                pgv.innerHTML = '加载完成'

+                clearInterval(timer)

+            }

+        }, 100)

     }

+    

+    staticProgress()

 </script>

 

 </html>

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.