细节优化

api/index.js

@@ -172,6 +172,12 @@ export const getUserByCompanyCode = (data) => {
 	return http.post(url, d)
 }
 
+export const getProcessByCompanyCode = (data) => {
+	let url = `/service/S_SC_GX_01`;
+	let d = setParamsData(data)
+	return http.post(url, d)
+}
+
 export const getImgInfoList = (data) => {
 	let url = `/service/S_XC_IMG`;
 	let d = setParamsData(data)

pages/product-order/list.vue

@@ -105,15 +105,33 @@
 							<text class="text-title">{{item.quantity}}</text>
 						</view>
 						<view  class="flex-row">
-							<text class="text-gray part-1">完工数量</text>
+							<text class="text-gray part-1">任务单重</text>
 							<text class="text-gray part-2">:</text>
-							<text class="text-title">{{item.finishQuantity}}</text>
+							<text class="text-title">{{Number(item.singleWeight)}}</text>
 						</view>
-						<!-- <view  class="flex-row">
+						<view  class="flex-row">
+							<text class="text-gray part-1">任务总重</text>
+							<text class="text-gray part-2">:</text>
+							<text class="text-title">{{Number(item.totalWeight)}}</text>
+						</view>
+						
+						<view  class="flex-row">
+							<text class="text-gray part-1">完工重量</text>
+							<text class="text-gray part-2">:</text>
+							<text class="text-title">{{Number(item.finishWeight)}}</text>
+						</view>
+						
+						<view  class="flex-row">
+							<text class="text-gray part-1">待完工重量</text>
+							<text class="text-gray part-2">:</text>
+							<text class="text-title">{{Number(item.unfinishWeight)}}</text>
+						</view>
+						
+						<view  class="flex-row">
 							<text class="text-gray part-1">完成状态</text>
 							<text class="text-gray part-2">:</text>
-							<text class="text-title">{{Number(item.finishQuantity) >= Number(item.quantity)? '已完工':'未完工'}}</text>
-						</view> -->
+							<text class="text-title">{{Number(item.unfinishWeight) <= 0? '已完工':'未完工'}}</text>
+						</view>
 					</view>
 					
 
@@ -141,6 +159,7 @@
 	} from "@/utils/tools.js";
 	import moment from "@/common/moment.js";
     import { getParamsList,getList,getCount } from "@/api/product-order.js";
+	import { getProcessByCompanyCode } from "@/api/index.js";
 
 	export default {
 		data() {
@@ -267,12 +286,15 @@
 				})
 			},
 			onLoading() {
-                getParamsList().then(res=>{
-					if(res.data && res.data.length){
-						let list = res.data.map(item=>{
+                getProcessByCompanyCode({
+					companyCode: uni.getStorageSync("")
+				}).then(res=>{
+					console.log(res,9999)
+					if(res.data.__sys__.status === 0){
+						let list = toJsonData(res.data.__blocks__.processCode_block_id.rows,res.data.__blocks__.processCode_block_id.meta.columns).map(item=>{
 							return {
-								label: item.companyName,
-								value: item.companyCode
+								label: item.textField,
+								value: item.valueField
 							}
 						})
 						this.factoryList = [...this.factoryList,...list];
@@ -289,7 +311,7 @@
 				getList({
 					...this.queryData,
 					completeStatus:this.tabList[this.current].value,
-					companyCode: this.factoryList[this.index].value
+					processCode: this.factoryList[this.index].value
 				},this.pageData).then(res => {
 					uni.hideLoading();
 					let list = toJsonData(res.data.__blocks__.result.rows,res.data.__blocks__.result.meta.columns);

vue.config.js

@@ -6,8 +6,8 @@ module.exports = {
 	    proxy: {
 	      '/prod-api': {
 	        // target: `http://10.24.4.81:8099/hggp`,
-			// target: `http://129.211.46.84:8085/hggp`,
-			target: `https://www.eis-paas.com/hggp`,
+			target: `http://129.211.46.84:8085/hggp`,
+			// target: `https://www.eis-paas.com/hggp`,
 	        changeOrigin: true,
 	        pathRewrite: {
 	          '/prod-api': ''