流转步骤参数

manifest.json

@@ -2,8 +2,8 @@
     "name" : "气瓶安全追溯",
     "appid" : "__UNI__10C0A5F",
     "description" : "",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.0.10",
+    "versionCode" : 110,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/home/index.vue

@@ -141,6 +141,7 @@
 						qr_id: qrid,
 					},
 					success: (res) => {
+						console.log(res,134)
 						if (res.data.code == 0) {
 							var arr = res.data.data
 							// this.frequencyCoding = arr.inner_code

pages/index/codeTracing.vue

@@ -104,6 +104,7 @@
 			traceSource(code) {
 				if (code) {
 					this.$api.get('/api/gas-cylinder/uid/' + code).then(res => {
+						console.log(res,7)
 						if (res.code == 200) {
 							this.gasCylinderList = res.data.gasCylinder
 							this.operationLogList = res.data.operationLog

pages/information/flowStep.vue

@@ -91,6 +91,8 @@
 					flowId = '25'
 				} else if (value == '司机确认重瓶从门店出库') {
 					flowId = '033'
+				} else if (value == '司机确定重瓶从气站出库') {
+					flowId = '17'
 				} else if (value == '司机确认空瓶装车') {
 					flowId = '11'
 				} else if (value == '司机回收不合格瓶') {

pages/information/index.vue

@@ -17,7 +17,7 @@
 		<!-- 在这里放置可滚动的内容 -->
 		<view v-if="list.length > 0">
 			<u-swipe-action>
-				<u-swipe-action-item :name="index" :options="options" v-for="(item,index) in list" :key="index"
+				<u-swipe-action-item :name="index" :options="optionsList" v-for="(item,index) in list" :key="index"
 					@click="event=>slideDelete(event,item)" :ref="'swipeAction' + index">
 					<view class="card_dinay">
 						<view style="display: flex;align-items: center;">
@@ -77,6 +77,7 @@
 				loadingMore: true,
 				allotFlag: true,
 				disqualification: true,
+				optionsList: [],
 				options: [{
 					text: '删除',
 					style: {
@@ -102,6 +103,7 @@
 				this.allotFlag = true
 				this.disqualification = true
 			}
+			this.optionsList = this.options
 			this.getList()
 		},
 		methods: {
@@ -129,7 +131,13 @@
 				} else if (this.current == 1) {
 					this.delSteelCylinder(value.id, event.name)
 				} else if (this.current == 3) {
-					this.delSteelCylinder(value.id, event.name)
+					let arr = []
+					if (event.index == 0) {
+						arr.push(value.inner_code)
+						this.editSteelCylinder('2', arr, event.name)
+					} else {
+						this.delSteelCylinder(value.id, event.name)
+					}
 				}
 			},
 			// 修改钢瓶状态
@@ -187,27 +195,38 @@
 					this.disqualification = true
 				}
 				if (value.index == 1) {
-					let arr = {
+					let arr = [{
 						text: '超期',
 						style: {
 							backgroundColor: '#ff9900'
 						}
-					}
-					let arr1 = {
+					}, {
 						text: '报废',
 						style: {
 							backgroundColor: '#fab6b6'
 						}
-					}
-					this.options.unshift(arr1)
-					this.options.unshift(arr)
+					}, {
+						text: '删除',
+						style: {
+							backgroundColor: '#f56c6c'
+						}
+					}]
+					this.optionsList = arr
+				} else if (value.index == 2) {
+					let arr1 = [{
+						text: '空瓶',
+						style: {
+							backgroundColor: '#ff9900'
+						}
+					}, {
+						text: '删除',
+						style: {
+							backgroundColor: '#f56c6c'
+						}
+					}]
+					this.optionsList = arr1
 				} else {
-					if (this.options[0].text == '超期') {
-						this.options.splice(0, 1)
-					}
-					if (this.options[0].text == '报废') {
-						this.options.splice(0, 1)
-					}
+					this.optionsList = this.options
 				}
 				this.current = value.index + 1
 				this.Pagination.PageIndex = 1
@@ -217,7 +236,22 @@
 			// 超期/报废
 			standardClick(event) {
 				this.belowStandard = event.index
-
+				if (event.index == 0) {
+					let arr1 = [{
+						text: '空瓶',
+						style: {
+							backgroundColor: '#ff9900'
+						}
+					}, {
+						text: '删除',
+						style: {
+							backgroundColor: '#f56c6c'
+						}
+					}]
+					this.optionsList = arr1
+				} else {
+					this.optionsList = this.options
+				}
 				this.Pagination.PageIndex = 1
 				this.list = []
 				this.getList()

pages/information/transfer.vue

@@ -1,19 +1,19 @@
 <template>
 	<!-- 调拨钢瓶 -->
 	<view>
-		<u-navbar title="钢瓶调拨" autoBack placeholder></u-navbar>
+		<u-navbar :title="headTransfer" autoBack placeholder></u-navbar>
 		<view class="card_transfer">
 			<!-- <view style="display: flex;align-items: center;" @click="allotSweep" v-if="allotFlag">
 				<view class="tran_title">扫描调拨码</view>
 				<u-icon name="scan" size="30"></u-icon>
 			</view> -->
-			<view style="display: flex; align-items: center;">
+			<view style="display: flex; align-items: center;" v-if="allotFlag">
 				<u-button style="margin-right: 30rpx;" color="#19be6b" type="success" text="选择接收人信息"
 					@click="selectiveFlow"></u-button>
 				<u-button type="success" color="#19be6b" text="扫描调拨码" icon="scan" @click="allotSweep"></u-button>
 			</view>
 			<!-- <view class="card_assigner_aaf" @click="selectDispatcher"> -->
-			<view class="card_assigner_aaf" :class="haveSelected ? 'greyMaskCard' : ''" v-if="assignerFlag">
+			<view class="card_assigner_aaf" :class="haveSelected ? 'greyMaskCard' : ''" v-if="assignerFlag && allotFlag">
 				<view class="step_title">流转步骤</view>
 				<view class="flow_step_title">{{ userList.flowName || '调拨流转步骤信息' }}</view>
 				<view class="step_title">接收人信息</view>
@@ -190,6 +190,7 @@
 				shopData: {},
 				// 接收人
 				recipientData: {},
+				headTransfer:'',
 			}
 		},
 		watch: {
@@ -243,8 +244,10 @@
 			this.current = value.status
 			if (value.allotFlag == 'false') {
 				this.allotFlag = false
+				this.headTransfer = '钢瓶充装'
 			} else {
 				this.allotFlag = true
+				this.headTransfer = '钢瓶调拨'
 			}
 		},
 		mounted() {

unpackage/cache/wgt/__UNI__10C0A5F/static/fonts/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe65e;</span>
+                <div class="name">调拨单</div>
+                <div class="code-name">&amp;#xe65e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe600;</span>
+                <div class="name">调拨单-copy</div>
+                <div class="code-name">&amp;#xe600;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe60a;</span>
                 <div class="name">订单</div>
                 <div class="code-name">&amp;#xe60a;</div>
@@ -228,9 +240,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1721630616175') format('woff2'),
-       url('iconfont.woff?t=1721630616175') format('woff'),
-       url('iconfont.ttf?t=1721630616175') format('truetype');
+  src: url('iconfont.woff2?t=1723624389024') format('woff2'),
+       url('iconfont.woff?t=1723624389024') format('woff'),
+       url('iconfont.ttf?t=1723624389024') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -257,6 +269,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-tiaobodan"></span>
+            <div class="name">
+              调拨单
+            </div>
+            <div class="code-name">.icon-tiaobodan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-moveais"></span>
+            <div class="name">
+              调拨单-copy
+            </div>
+            <div class="code-name">.icon-moveais
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-dingdan2"></span>
             <div class="name">
               订单
@@ -519,6 +549,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tiaobodan"></use>
+                </svg>
+                <div class="name">调拨单</div>
+                <div class="code-name">#icon-tiaobodan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-moveais"></use>
+                </svg>
+                <div class="name">调拨单-copy</div>
+                <div class="code-name">#icon-moveais</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-dingdan2"></use>
                 </svg>
                 <div class="name">订单</div>

unpackage/cache/wgt/__UNI__10C0A5F/static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4430625 */
-  src: url('@/static/fonts/iconfont.woff2?t=1721630616175') format('woff2'),
-       url('@/static/fonts/iconfont.woff?t=1721630616175') format('woff'),
-       url('@/static/fonts/iconfont.ttf?t=1721630616175') format('truetype');
+  src: url('@/static/fonts/iconfont.woff2?t=1723624389024') format('woff2'),
+       url('@/static/fonts/iconfont.woff?t=1723624389024') format('woff'),
+       url('@/static/fonts/iconfont.ttf?t=1723624389024') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tiaobodan:before {
+  content: "\e65e";
+}
+
+.icon-moveais:before {
+  content: "\e600";
+}
+
 .icon-dingdan2:before {
   content: "\e60a";
 }

unpackage/cache/wgt/__UNI__10C0A5F/static/fonts/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "2317530",
+      "name": "调拨单",
+      "font_class": "tiaobodan",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "40412137",
+      "name": "调拨单-copy",
+      "font_class": "moveais",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
       "icon_id": "852293",
       "name": "订单",
       "font_class": "dingdan2",

unpackage/cache/wgt/__UNI__10C0A5F/static/js/blockSort.js

@@ -1,176 +1,237 @@
 export const statisticalState = () => {
-  return [{
-      label: '已提交待审批',
-      value: 'inform',
-    },
-    {
-      label: '在用',
-      value: 'using',
-    },
-    {
-      label: '报废',
-      value: 'scrapped',
-    },
-  ]
+	return [{
+			label: '已提交待审批',
+			value: 'inform',
+		},
+		{
+			label: '在用',
+			value: 'using',
+		},
+		{
+			label: '报废',
+			value: 'scrapped',
+		},
+	]
 }
 export const neurogen = () => {
-  return [{
-      label: '液化石油气',
-      value: 0,
-    },
-    {
-      label: '二甲醚',
-      value: 1,
-    },
-    {
-      label: '氧气',
-      value: 2,
-    },
-    {
-      label: '二氧化碳',
-      value: 3,
-    },
-    {
-      label: '溶解乙炔',
-      value: 4,
-    }
-  ]
+	return [{
+			label: '液化石油气',
+			value: 0,
+		},
+		{
+			label: '二甲醚',
+			value: 1,
+		},
+		{
+			label: '氧气',
+			value: 2,
+		},
+		{
+			label: '二氧化碳',
+			value: 3,
+		},
+		{
+			label: '溶解乙炔',
+			value: 4,
+		}
+	]
 }
 export const attribution = () => {
-  return [{
-      label: '门店',
-      value: '0001',
-    },
-    {
-      label: '气站',
-      value: '0002',
-    },
-    {
-      label: '企业',
-      value: '0003',
-    },
-    {
-      label: '检验机构',
-      value: '0004',
-    },
-    {
-      label: '移动库',
-      value: '005',
-    },
-    {
-      label: '门店',
-      value: '006',
-    }
-  ]
+	return [{
+			label: '门店',
+			value: '0001',
+		},
+		{
+			label: '气站',
+			value: '0002',
+		},
+		{
+			label: '企业',
+			value: '0003',
+		},
+		{
+			label: '检验机构',
+			value: '0004',
+		},
+		{
+			label: '移动库',
+			value: '005',
+		},
+		{
+			label: '门店',
+			value: '006',
+		}
+	]
 }
 export const cylinderCondition = () => {
-  return [{
-      label: '新瓶提交',
-      value: 'submit',
-    },
-    {
-      label: '在用(以检验)',
-      value: 'using',
-    },
-    {
-      label: '停用(待检验)',
-      value: 'stop',
-    },
-    {
-      label: '报废',
-      value: 'scrapped',
-    }
-  ]
+	return [{
+			label: '新瓶提交',
+			value: 'submit',
+		},
+		{
+			label: '在用(以检验)',
+			value: 'using',
+		},
+		{
+			label: '停用(待检验)',
+			value: 'stop',
+		},
+		{
+			label: '报废',
+			value: 'scrapped',
+		}
+	]
 }
 
 export const process = () => {
-  return [{
-      label: '商家入库',
-      value: '6',
-    },
-    {
-      label: '门店空瓶出库',
-      value: '10',
-    },
-    {
-      label: '司机确认空瓶装车',
-      value: '11',
-    },
-    {
-      label: '司机运输空瓶到达气站',
-      value: '12',
-    },
-    {
-      label: '气站确认空瓶到达气站',
-      value: '13',
-    },
-    {
-      label: '气站充装空瓶',
-      value: '14',
-    },
-    {
-      label: '气站重瓶出库',
-      value: '15',
-    },
-    {
-      label: '司机将订单退回气站',
-      value: '16',
-    },
-    {
-      label: '司机确认重瓶从气站出库',
-      value: '17',
-    },
-    {
-      label: '司机交付门店',
-      value: '19',
-    },
-    {
-      label: '门店回收空瓶',
-      value: '21',
-    },
-    {
-      label: '气瓶检验',
-      value: '23',
-    },
-    {
-      label: '送气员领重瓶出库',
-      value: '25',
-    },
-    {
-      label: '送气员送达重瓶',
-      value: '26',
-    },
-    {
-      label: '送气员回收空瓶',
-      value: '27',
-    },
-    {
-      label: '门店确认重瓶卸货入库',
-      value: '31',
-    },
-    {
-      label: '门店将重瓶退回司机',
-      value: '33',
-    },
-    {
-      label: '门店取消订单',
-      value: '34',
-    },
-    {
-      label: '门店确认未配送重瓶返库',
-      value: '35',
-    },
-    {
-      label: '送气订单取消',
-      value: '36',
-    },
-    {
-      label: '门店重瓶出库',
-      value: '37',
-    },
-    {
-      label: '上报流程异常信息',
-      value: '1000',
-    }
-  ]
+	return [{
+			label: '商家入库',
+			value: '6',
+		},
+		{
+			label: '门店空瓶出库',
+			value: '10',
+		},
+		{
+			label: '司机确认空瓶装车',
+			value: '11',
+		},
+		{
+			label: '司机运输空瓶到达气站',
+			value: '12',
+		},
+		{
+			label: '气站确认空瓶到达气站',
+			value: '13',
+		},
+		{
+			label: '气站充装空瓶',
+			value: '14',
+		},
+		{
+			label: '气站重瓶出库',
+			value: '15',
+		},
+		{
+			label: '司机将订单退回气站',
+			value: '16',
+		},
+		{
+			label: '司机确认重瓶从气站出库',
+			value: '17',
+		},
+		{
+			label: '司机交付门店',
+			value: '19',
+		},
+		{
+			label: '门店回收空瓶',
+			value: '21',
+		},
+		{
+			label: '气瓶检验',
+			value: '23',
+		},
+		{
+			label: '送气员领重瓶出库',
+			value: '25',
+		},
+		{
+			label: '送气员送达重瓶',
+			value: '26',
+		},
+		{
+			label: '送气员回收空瓶',
+			value: '27',
+		},
+		{
+			label: '门店确认重瓶卸货入库',
+			value: '31',
+		},
+		{
+			label: '门店将重瓶退回司机',
+			value: '33',
+		},
+		{
+			label: '门店取消订单',
+			value: '34',
+		},
+		{
+			label: '门店确认未配送重瓶返库',
+			value: '35',
+		},
+		{
+			label: '送气订单取消',
+			value: '36',
+		},
+		{
+			label: '门店重瓶出库',
+			value: '37',
+		},
+		{
+			label: '上报流程异常信息',
+			value: '1000',
+		}
+	]
 }
+
+export const flowStep = () => {
+	return [{
+		label: '司机确定重瓶从气站出库',
+		value: '17',
+	}, {
+		label: '司机回收超期瓶',
+		value: 'sjextended',
+	}, {
+		label: '司机回收报废瓶',
+		value: 'sjscrap',
+	}, {
+		label: '门店确定重瓶卸货入库',
+		value: '31',
+	}, {
+		label: '气站确定重瓶到达气站',
+		value: '016',
+	}, {
+		label: '气站确定空瓶到达气站',
+		value: '13',
+	}, {
+		label: '门店回收超期瓶',
+		value: 'mdextended',
+	}, {
+		label: '气站回收超期瓶',
+		value: 'qzextended',
+	}, {
+		label: '门店回收报废瓶',
+		value: 'mdscrap',
+	}, {
+		label: '气站回收报废瓶',
+		value: 'qzscrap',
+	}, {
+		label: '送气员领重瓶出库',
+		value: '25',
+	}, {
+		label: '司机确定重瓶从门店出库',
+		value: '033',
+	}, {
+		label: '司机确定空瓶装车',
+		value: '11',
+	}, {
+		label: '司机回收超期瓶',
+		value: 'sjextended',
+	}, {
+		label: '司机回收报废瓶',
+		value: 'sjscrap',
+	}, {
+		label: '门店确定未配送重瓶返库',
+		value: '35',
+	}, {
+		label: '门店回收空瓶',
+		value: '21',
+	}, {
+		label: '门店回收超期瓶',
+		value: 'mdextended',
+	}, {
+		label: '门店回收报废瓶',
+		value: 'mdscrap',
+	}, ]
+}

unpackage/dist/build/app-plus/static/fonts/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe65e;</span>
+                <div class="name">调拨单</div>
+                <div class="code-name">&amp;#xe65e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe600;</span>
+                <div class="name">调拨单-copy</div>
+                <div class="code-name">&amp;#xe600;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe60a;</span>
                 <div class="name">订单</div>
                 <div class="code-name">&amp;#xe60a;</div>
@@ -228,9 +240,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1721630616175') format('woff2'),
-       url('iconfont.woff?t=1721630616175') format('woff'),
-       url('iconfont.ttf?t=1721630616175') format('truetype');
+  src: url('iconfont.woff2?t=1723624389024') format('woff2'),
+       url('iconfont.woff?t=1723624389024') format('woff'),
+       url('iconfont.ttf?t=1723624389024') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -257,6 +269,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-tiaobodan"></span>
+            <div class="name">
+              调拨单
+            </div>
+            <div class="code-name">.icon-tiaobodan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-moveais"></span>
+            <div class="name">
+              调拨单-copy
+            </div>
+            <div class="code-name">.icon-moveais
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-dingdan2"></span>
             <div class="name">
               订单
@@ -519,6 +549,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tiaobodan"></use>
+                </svg>
+                <div class="name">调拨单</div>
+                <div class="code-name">#icon-tiaobodan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-moveais"></use>
+                </svg>
+                <div class="name">调拨单-copy</div>
+                <div class="code-name">#icon-moveais</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-dingdan2"></use>
                 </svg>
                 <div class="name">订单</div>

unpackage/dist/build/app-plus/static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4430625 */
-  src: url('@/static/fonts/iconfont.woff2?t=1721630616175') format('woff2'),
-       url('@/static/fonts/iconfont.woff?t=1721630616175') format('woff'),
-       url('@/static/fonts/iconfont.ttf?t=1721630616175') format('truetype');
+  src: url('@/static/fonts/iconfont.woff2?t=1723624389024') format('woff2'),
+       url('@/static/fonts/iconfont.woff?t=1723624389024') format('woff'),
+       url('@/static/fonts/iconfont.ttf?t=1723624389024') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tiaobodan:before {
+  content: "\e65e";
+}
+
+.icon-moveais:before {
+  content: "\e600";
+}
+
 .icon-dingdan2:before {
   content: "\e60a";
 }

unpackage/dist/build/app-plus/static/fonts/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "2317530",
+      "name": "调拨单",
+      "font_class": "tiaobodan",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "40412137",
+      "name": "调拨单-copy",
+      "font_class": "moveais",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
       "icon_id": "852293",
       "name": "订单",
       "font_class": "dingdan2",

unpackage/dist/build/app-plus/static/js/blockSort.js

@@ -1,176 +1,237 @@
 export const statisticalState = () => {
-  return [{
-      label: '已提交待审批',
-      value: 'inform',
-    },
-    {
-      label: '在用',
-      value: 'using',
-    },
-    {
-      label: '报废',
-      value: 'scrapped',
-    },
-  ]
+	return [{
+			label: '已提交待审批',
+			value: 'inform',
+		},
+		{
+			label: '在用',
+			value: 'using',
+		},
+		{
+			label: '报废',
+			value: 'scrapped',
+		},
+	]
 }
 export const neurogen = () => {
-  return [{
-      label: '液化石油气',
-      value: 0,
-    },
-    {
-      label: '二甲醚',
-      value: 1,
-    },
-    {
-      label: '氧气',
-      value: 2,
-    },
-    {
-      label: '二氧化碳',
-      value: 3,
-    },
-    {
-      label: '溶解乙炔',
-      value: 4,
-    }
-  ]
+	return [{
+			label: '液化石油气',
+			value: 0,
+		},
+		{
+			label: '二甲醚',
+			value: 1,
+		},
+		{
+			label: '氧气',
+			value: 2,
+		},
+		{
+			label: '二氧化碳',
+			value: 3,
+		},
+		{
+			label: '溶解乙炔',
+			value: 4,
+		}
+	]
 }
 export const attribution = () => {
-  return [{
-      label: '门店',
-      value: '0001',
-    },
-    {
-      label: '气站',
-      value: '0002',
-    },
-    {
-      label: '企业',
-      value: '0003',
-    },
-    {
-      label: '检验机构',
-      value: '0004',
-    },
-    {
-      label: '移动库',
-      value: '005',
-    },
-    {
-      label: '门店',
-      value: '006',
-    }
-  ]
+	return [{
+			label: '门店',
+			value: '0001',
+		},
+		{
+			label: '气站',
+			value: '0002',
+		},
+		{
+			label: '企业',
+			value: '0003',
+		},
+		{
+			label: '检验机构',
+			value: '0004',
+		},
+		{
+			label: '移动库',
+			value: '005',
+		},
+		{
+			label: '门店',
+			value: '006',
+		}
+	]
 }
 export const cylinderCondition = () => {
-  return [{
-      label: '新瓶提交',
-      value: 'submit',
-    },
-    {
-      label: '在用(以检验)',
-      value: 'using',
-    },
-    {
-      label: '停用(待检验)',
-      value: 'stop',
-    },
-    {
-      label: '报废',
-      value: 'scrapped',
-    }
-  ]
+	return [{
+			label: '新瓶提交',
+			value: 'submit',
+		},
+		{
+			label: '在用(以检验)',
+			value: 'using',
+		},
+		{
+			label: '停用(待检验)',
+			value: 'stop',
+		},
+		{
+			label: '报废',
+			value: 'scrapped',
+		}
+	]
 }
 
 export const process = () => {
-  return [{
-      label: '商家入库',
-      value: '6',
-    },
-    {
-      label: '门店空瓶出库',
-      value: '10',
-    },
-    {
-      label: '司机确认空瓶装车',
-      value: '11',
-    },
-    {
-      label: '司机运输空瓶到达气站',
-      value: '12',
-    },
-    {
-      label: '气站确认空瓶到达气站',
-      value: '13',
-    },
-    {
-      label: '气站充装空瓶',
-      value: '14',
-    },
-    {
-      label: '气站重瓶出库',
-      value: '15',
-    },
-    {
-      label: '司机将订单退回气站',
-      value: '16',
-    },
-    {
-      label: '司机确认重瓶从气站出库',
-      value: '17',
-    },
-    {
-      label: '司机交付门店',
-      value: '19',
-    },
-    {
-      label: '门店回收空瓶',
-      value: '21',
-    },
-    {
-      label: '气瓶检验',
-      value: '23',
-    },
-    {
-      label: '送气员领重瓶出库',
-      value: '25',
-    },
-    {
-      label: '送气员送达重瓶',
-      value: '26',
-    },
-    {
-      label: '送气员回收空瓶',
-      value: '27',
-    },
-    {
-      label: '门店确认重瓶卸货入库',
-      value: '31',
-    },
-    {
-      label: '门店将重瓶退回司机',
-      value: '33',
-    },
-    {
-      label: '门店取消订单',
-      value: '34',
-    },
-    {
-      label: '门店确认未配送重瓶返库',
-      value: '35',
-    },
-    {
-      label: '送气订单取消',
-      value: '36',
-    },
-    {
-      label: '门店重瓶出库',
-      value: '37',
-    },
-    {
-      label: '上报流程异常信息',
-      value: '1000',
-    }
-  ]
+	return [{
+			label: '商家入库',
+			value: '6',
+		},
+		{
+			label: '门店空瓶出库',
+			value: '10',
+		},
+		{
+			label: '司机确认空瓶装车',
+			value: '11',
+		},
+		{
+			label: '司机运输空瓶到达气站',
+			value: '12',
+		},
+		{
+			label: '气站确认空瓶到达气站',
+			value: '13',
+		},
+		{
+			label: '气站充装空瓶',
+			value: '14',
+		},
+		{
+			label: '气站重瓶出库',
+			value: '15',
+		},
+		{
+			label: '司机将订单退回气站',
+			value: '16',
+		},
+		{
+			label: '司机确认重瓶从气站出库',
+			value: '17',
+		},
+		{
+			label: '司机交付门店',
+			value: '19',
+		},
+		{
+			label: '门店回收空瓶',
+			value: '21',
+		},
+		{
+			label: '气瓶检验',
+			value: '23',
+		},
+		{
+			label: '送气员领重瓶出库',
+			value: '25',
+		},
+		{
+			label: '送气员送达重瓶',
+			value: '26',
+		},
+		{
+			label: '送气员回收空瓶',
+			value: '27',
+		},
+		{
+			label: '门店确认重瓶卸货入库',
+			value: '31',
+		},
+		{
+			label: '门店将重瓶退回司机',
+			value: '33',
+		},
+		{
+			label: '门店取消订单',
+			value: '34',
+		},
+		{
+			label: '门店确认未配送重瓶返库',
+			value: '35',
+		},
+		{
+			label: '送气订单取消',
+			value: '36',
+		},
+		{
+			label: '门店重瓶出库',
+			value: '37',
+		},
+		{
+			label: '上报流程异常信息',
+			value: '1000',
+		}
+	]
 }
+
+export const flowStep = () => {
+	return [{
+		label: '司机确定重瓶从气站出库',
+		value: '17',
+	}, {
+		label: '司机回收超期瓶',
+		value: 'sjextended',
+	}, {
+		label: '司机回收报废瓶',
+		value: 'sjscrap',
+	}, {
+		label: '门店确定重瓶卸货入库',
+		value: '31',
+	}, {
+		label: '气站确定重瓶到达气站',
+		value: '016',
+	}, {
+		label: '气站确定空瓶到达气站',
+		value: '13',
+	}, {
+		label: '门店回收超期瓶',
+		value: 'mdextended',
+	}, {
+		label: '气站回收超期瓶',
+		value: 'qzextended',
+	}, {
+		label: '门店回收报废瓶',
+		value: 'mdscrap',
+	}, {
+		label: '气站回收报废瓶',
+		value: 'qzscrap',
+	}, {
+		label: '送气员领重瓶出库',
+		value: '25',
+	}, {
+		label: '司机确定重瓶从门店出库',
+		value: '033',
+	}, {
+		label: '司机确定空瓶装车',
+		value: '11',
+	}, {
+		label: '司机回收超期瓶',
+		value: 'sjextended',
+	}, {
+		label: '司机回收报废瓶',
+		value: 'sjscrap',
+	}, {
+		label: '门店确定未配送重瓶返库',
+		value: '35',
+	}, {
+		label: '门店回收空瓶',
+		value: '21',
+	}, {
+		label: '门店回收超期瓶',
+		value: 'mdextended',
+	}, {
+		label: '门店回收报废瓶',
+		value: 'mdscrap',
+	}, ]
+}

unpackage/dist/dev/app-plus/static/fonts/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe65e;</span>
+                <div class="name">调拨单</div>
+                <div class="code-name">&amp;#xe65e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe600;</span>
+                <div class="name">调拨单-copy</div>
+                <div class="code-name">&amp;#xe600;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe60a;</span>
                 <div class="name">订单</div>
                 <div class="code-name">&amp;#xe60a;</div>
@@ -228,9 +240,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1721630616175') format('woff2'),
-       url('iconfont.woff?t=1721630616175') format('woff'),
-       url('iconfont.ttf?t=1721630616175') format('truetype');
+  src: url('iconfont.woff2?t=1723624389024') format('woff2'),
+       url('iconfont.woff?t=1723624389024') format('woff'),
+       url('iconfont.ttf?t=1723624389024') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -257,6 +269,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-tiaobodan"></span>
+            <div class="name">
+              调拨单
+            </div>
+            <div class="code-name">.icon-tiaobodan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-moveais"></span>
+            <div class="name">
+              调拨单-copy
+            </div>
+            <div class="code-name">.icon-moveais
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-dingdan2"></span>
             <div class="name">
               订单
@@ -519,6 +549,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tiaobodan"></use>
+                </svg>
+                <div class="name">调拨单</div>
+                <div class="code-name">#icon-tiaobodan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-moveais"></use>
+                </svg>
+                <div class="name">调拨单-copy</div>
+                <div class="code-name">#icon-moveais</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-dingdan2"></use>
                 </svg>
                 <div class="name">订单</div>

unpackage/dist/dev/app-plus/static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4430625 */
-  src: url('@/static/fonts/iconfont.woff2?t=1721630616175') format('woff2'),
-       url('@/static/fonts/iconfont.woff?t=1721630616175') format('woff'),
-       url('@/static/fonts/iconfont.ttf?t=1721630616175') format('truetype');
+  src: url('@/static/fonts/iconfont.woff2?t=1723624389024') format('woff2'),
+       url('@/static/fonts/iconfont.woff?t=1723624389024') format('woff'),
+       url('@/static/fonts/iconfont.ttf?t=1723624389024') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tiaobodan:before {
+  content: "\e65e";
+}
+
+.icon-moveais:before {
+  content: "\e600";
+}
+
 .icon-dingdan2:before {
   content: "\e60a";
 }

unpackage/dist/dev/app-plus/static/fonts/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "2317530",
+      "name": "调拨单",
+      "font_class": "tiaobodan",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "40412137",
+      "name": "调拨单-copy",
+      "font_class": "moveais",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
       "icon_id": "852293",
       "name": "订单",
       "font_class": "dingdan2",

unpackage/dist/dev/app-plus/static/js/blockSort.js

@@ -1,176 +1,237 @@
 export const statisticalState = () => {
-  return [{
-      label: '已提交待审批',
-      value: 'inform',
-    },
-    {
-      label: '在用',
-      value: 'using',
-    },
-    {
-      label: '报废',
-      value: 'scrapped',
-    },
-  ]
+	return [{
+			label: '已提交待审批',
+			value: 'inform',
+		},
+		{
+			label: '在用',
+			value: 'using',
+		},
+		{
+			label: '报废',
+			value: 'scrapped',
+		},
+	]
 }
 export const neurogen = () => {
-  return [{
-      label: '液化石油气',
-      value: 0,
-    },
-    {
-      label: '二甲醚',
-      value: 1,
-    },
-    {
-      label: '氧气',
-      value: 2,
-    },
-    {
-      label: '二氧化碳',
-      value: 3,
-    },
-    {
-      label: '溶解乙炔',
-      value: 4,
-    }
-  ]
+	return [{
+			label: '液化石油气',
+			value: 0,
+		},
+		{
+			label: '二甲醚',
+			value: 1,
+		},
+		{
+			label: '氧气',
+			value: 2,
+		},
+		{
+			label: '二氧化碳',
+			value: 3,
+		},
+		{
+			label: '溶解乙炔',
+			value: 4,
+		}
+	]
 }
 export const attribution = () => {
-  return [{
-      label: '门店',
-      value: '0001',
-    },
-    {
-      label: '气站',
-      value: '0002',
-    },
-    {
-      label: '企业',
-      value: '0003',
-    },
-    {
-      label: '检验机构',
-      value: '0004',
-    },
-    {
-      label: '移动库',
-      value: '005',
-    },
-    {
-      label: '门店',
-      value: '006',
-    }
-  ]
+	return [{
+			label: '门店',
+			value: '0001',
+		},
+		{
+			label: '气站',
+			value: '0002',
+		},
+		{
+			label: '企业',
+			value: '0003',
+		},
+		{
+			label: '检验机构',
+			value: '0004',
+		},
+		{
+			label: '移动库',
+			value: '005',
+		},
+		{
+			label: '门店',
+			value: '006',
+		}
+	]
 }
 export const cylinderCondition = () => {
-  return [{
-      label: '新瓶提交',
-      value: 'submit',
-    },
-    {
-      label: '在用(以检验)',
-      value: 'using',
-    },
-    {
-      label: '停用(待检验)',
-      value: 'stop',
-    },
-    {
-      label: '报废',
-      value: 'scrapped',
-    }
-  ]
+	return [{
+			label: '新瓶提交',
+			value: 'submit',
+		},
+		{
+			label: '在用(以检验)',
+			value: 'using',
+		},
+		{
+			label: '停用(待检验)',
+			value: 'stop',
+		},
+		{
+			label: '报废',
+			value: 'scrapped',
+		}
+	]
 }
 
 export const process = () => {
-  return [{
-      label: '商家入库',
-      value: '6',
-    },
-    {
-      label: '门店空瓶出库',
-      value: '10',
-    },
-    {
-      label: '司机确认空瓶装车',
-      value: '11',
-    },
-    {
-      label: '司机运输空瓶到达气站',
-      value: '12',
-    },
-    {
-      label: '气站确认空瓶到达气站',
-      value: '13',
-    },
-    {
-      label: '气站充装空瓶',
-      value: '14',
-    },
-    {
-      label: '气站重瓶出库',
-      value: '15',
-    },
-    {
-      label: '司机将订单退回气站',
-      value: '16',
-    },
-    {
-      label: '司机确认重瓶从气站出库',
-      value: '17',
-    },
-    {
-      label: '司机交付门店',
-      value: '19',
-    },
-    {
-      label: '门店回收空瓶',
-      value: '21',
-    },
-    {
-      label: '气瓶检验',
-      value: '23',
-    },
-    {
-      label: '送气员领重瓶出库',
-      value: '25',
-    },
-    {
-      label: '送气员送达重瓶',
-      value: '26',
-    },
-    {
-      label: '送气员回收空瓶',
-      value: '27',
-    },
-    {
-      label: '门店确认重瓶卸货入库',
-      value: '31',
-    },
-    {
-      label: '门店将重瓶退回司机',
-      value: '33',
-    },
-    {
-      label: '门店取消订单',
-      value: '34',
-    },
-    {
-      label: '门店确认未配送重瓶返库',
-      value: '35',
-    },
-    {
-      label: '送气订单取消',
-      value: '36',
-    },
-    {
-      label: '门店重瓶出库',
-      value: '37',
-    },
-    {
-      label: '上报流程异常信息',
-      value: '1000',
-    }
-  ]
+	return [{
+			label: '商家入库',
+			value: '6',
+		},
+		{
+			label: '门店空瓶出库',
+			value: '10',
+		},
+		{
+			label: '司机确认空瓶装车',
+			value: '11',
+		},
+		{
+			label: '司机运输空瓶到达气站',
+			value: '12',
+		},
+		{
+			label: '气站确认空瓶到达气站',
+			value: '13',
+		},
+		{
+			label: '气站充装空瓶',
+			value: '14',
+		},
+		{
+			label: '气站重瓶出库',
+			value: '15',
+		},
+		{
+			label: '司机将订单退回气站',
+			value: '16',
+		},
+		{
+			label: '司机确认重瓶从气站出库',
+			value: '17',
+		},
+		{
+			label: '司机交付门店',
+			value: '19',
+		},
+		{
+			label: '门店回收空瓶',
+			value: '21',
+		},
+		{
+			label: '气瓶检验',
+			value: '23',
+		},
+		{
+			label: '送气员领重瓶出库',
+			value: '25',
+		},
+		{
+			label: '送气员送达重瓶',
+			value: '26',
+		},
+		{
+			label: '送气员回收空瓶',
+			value: '27',
+		},
+		{
+			label: '门店确认重瓶卸货入库',
+			value: '31',
+		},
+		{
+			label: '门店将重瓶退回司机',
+			value: '33',
+		},
+		{
+			label: '门店取消订单',
+			value: '34',
+		},
+		{
+			label: '门店确认未配送重瓶返库',
+			value: '35',
+		},
+		{
+			label: '送气订单取消',
+			value: '36',
+		},
+		{
+			label: '门店重瓶出库',
+			value: '37',
+		},
+		{
+			label: '上报流程异常信息',
+			value: '1000',
+		}
+	]
 }
+
+export const flowStep = () => {
+	return [{
+		label: '司机确定重瓶从气站出库',
+		value: '17',
+	}, {
+		label: '司机回收超期瓶',
+		value: 'sjextended',
+	}, {
+		label: '司机回收报废瓶',
+		value: 'sjscrap',
+	}, {
+		label: '门店确定重瓶卸货入库',
+		value: '31',
+	}, {
+		label: '气站确定重瓶到达气站',
+		value: '016',
+	}, {
+		label: '气站确定空瓶到达气站',
+		value: '13',
+	}, {
+		label: '门店回收超期瓶',
+		value: 'mdextended',
+	}, {
+		label: '气站回收超期瓶',
+		value: 'qzextended',
+	}, {
+		label: '门店回收报废瓶',
+		value: 'mdscrap',
+	}, {
+		label: '气站回收报废瓶',
+		value: 'qzscrap',
+	}, {
+		label: '送气员领重瓶出库',
+		value: '25',
+	}, {
+		label: '司机确定重瓶从门店出库',
+		value: '033',
+	}, {
+		label: '司机确定空瓶装车',
+		value: '11',
+	}, {
+		label: '司机回收超期瓶',
+		value: 'sjextended',
+	}, {
+		label: '司机回收报废瓶',
+		value: 'sjscrap',
+	}, {
+		label: '门店确定未配送重瓶返库',
+		value: '35',
+	}, {
+		label: '门店回收空瓶',
+		value: '21',
+	}, {
+		label: '门店回收超期瓶',
+		value: 'mdextended',
+	}, {
+		label: '门店回收报废瓶',
+		value: 'mdscrap',
+	}, ]
+}