Merge branch 'master' of ssh://git.7in6.com:11022/dacheng/mes-dacheng-admin-backend-ui

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -12,10 +12,7 @@
               <el-button type="primary" icon="edit"   @click="addgd_onclick"   class="bt"   title="新增工单资料">新增</el-button>
               <el-button type="primary" icon="edit"   @click="addgdyj_onclick"   class="bt" title="新增颜色资料">新增颜色资料</el-button>
               <el-button type="primary" icon="edit"   @click="addgdgy_onclick"   class="bt" title="新增工序资料" >新增工序资料</el-button>
-              <el-button type="primary" icon="edit"   @click="addgd_onclick"   	 class="bt"   title="新增工单资料">新增</el-button>
-              <el-button type="primary" icon="edit"   @click="addgdyj_onclick"   class="bt" title="新增印件资料">新增颜色资料</el-button>
-              <el-button type="primary" icon="edit"   @click="addgdgy_onclick"   class="bt" title="新增工艺资料" >新增工序资料</el-button>
-              <el-button type="primary" icon="edit"   @click="cp_gdprintonClick" class="bt" title="打印生产工单" >工单打印</el-button>
+              <el-button type="primary" icon="edit"   @click="cp_gdprintonClick" class="bt" title="打印生产订单" >订单打印</el-button>
             </el-form-item>
           </el-form>
 
@@ -93,8 +90,9 @@
                           highlight-current-row="true"
                           @row-dblclick="gdyjupdateCompanyFunc"
                           @selection-change="selectionChange($event, '颜色资料')"
-                          style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ystableData" row-key="ID">
-                  <el-table-column type="selection" width="30" />
+                          style="width: 100%;height: 36vh" border show-summary
+                          :summary-method="getSummaries" tooltip-effect="dark" :data="ystableData" row-key="ID">
+                  <el-table-column type="selection" width="55" />
                   <el-table-column align="left" sortable label="序号" prop="序号"  width="100"/>
                   <el-table-column align="left" sortable label="订单子编号" prop="订单子编号"  width="120"/>
                   <el-table-column align="left" sortable label="颜色名称" prop="颜色名称"  width="110"/>
@@ -183,7 +181,94 @@
 			      </el-table>
 			    </el-tab-pane>
             </el-tabs>
+          <!-- 弹窗 -->
+          <el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog"  destroy-on-close style="width: 60%; height: 70%;">
+				<h1 style="margin: 0%;margin-bottom: 10px;">颜色资料修改</h1>
+				<el-row :gutter="24"  style="margin-bottom: 20px;">
+					<el-col :span="6">
+						<el-form-item label="订单子编号:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['订单子编号']" style="width: 100%;" id="订单子编号:" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="颜色名称:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['颜色名称']" style="width: 100%;" id="颜色名称" />
+						</el-form-item>
+					</el-col>
+				</el-row>
 
+				<el-row :gutter="24"  style="margin-bottom: 20px;">
+					<el-col :span="6">
+						<el-form-item label="船样:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['船样']" style="width: 100%;" id="船样" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="S:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['S']" style="width: 100%; height: 40px;" id="S" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<el-row :gutter="24"  style="margin-bottom: 20px;">
+					<el-col :span="6">
+						<el-form-item label="M:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['M']" style="width: 100%; height: 40px;" id="M" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="L:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['L']" style="width: 100%; height: 40px;" id="L" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<el-row :gutter="24"  style="margin-bottom: 20px;">
+					<el-col :span="6">
+						<el-form-item label="XL:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['XL']" style="width: 100%; height: 40px;" id="XL" />
+						</el-form-item>
+					</el-col>
+          <el-col :span="6">
+						<el-form-item label="XXL:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['XXL']" style="width: 100%; height: 40px;" id="XXL" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+        <el-row :gutter="24"  style="margin-bottom: 20px;">
+					<el-col :span="6">
+						<el-form-item label="制单总数:" prop="deliveryDate" class="mab" label-width="120px" style=" ">
+							<el-input v-model="edit_formData['制单总数']" style="width: 100%; height: 40px;" id="制单总数" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="建档用户:" prop="deliveryDate" class="mab" label-width="120px" style=" ">
+							<el-input v-model="edit_formData['建档用户']" style="width: 100%; height: 40px;" id="建档用户" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+        <el-row :gutter="24"  style="margin-bottom: 20px;">
+					<el-col :span="6">
+						<el-form-item label="建档时间:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['建档时间']" style="width: 100%; height: 40px;" id="建档时间" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="更新时间:" prop="deliveryDate" class="mab" label-width="120px" style="">
+							<el-input v-model="edit_formData['更新时间']" style="width: 100%; height: 40px;" id="更新时间" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<template #footer>
+					<div class="dialog-footer">
+						<el-button @click="edit_closeDialog"  style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
+						<el-button type="primary" @click="edit_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
+					</div>
+				</template>
+			</el-dialog>
 			
 			<!-- 新增工单资料 -->
             <el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog"  style="width: 55%;margin: 50px auto" :title="'新增'" destroy-on-close>
@@ -767,6 +852,36 @@ export default {
       reader.readAsDataURL(file); // 将文件读为Data URL
       return false; // 阻止文件的默认上传行为
     },
+    // 对列进行合算
+    getSummaries(param) {
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          // 只对amount这一列进行总计核算。
+
+         if (column.property === 'S'||column.property === 'M'||column.property === 'L'||column.property === 'XL'||column.property === 'XXL'||column.property === '制单总数') {
+            if (!values.every(value => isNaN(value))) {
+                sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr);
+                if (!isNaN(value)) {
+                    return prev + curr;
+                }else {
+                    return prev;
+                }
+              }, 0);
+                sums[index] += '';
+              } else {
+                sums[index] = '---'
+            }
+         }
+      });
+        return sums;
+    },
   }
 };
 </script>
@@ -1275,7 +1390,7 @@ const add_gxcloseDialog = () => {
     visible.value = false;
 }
 
-// =========== 工单打印 ===========
+// =========== 订单打印 ===========
 const cp_gdprintonClick = () => {
   // yunying/components/print页面
   printPageRef.value.open(_Gd_gdbh.value) 
@@ -1971,61 +2086,8 @@ const tableRowClick = async (row) => {
 };
 
 
-//=========修改工单资料========
-const dialogFormVisible = ref(false)
-let edit_gdscgdformData = ref({})
-//双击打开修改弹
-const updateCompanyFunc = async(row) => {
-	console.log("↓↓↓↓↓获取行数据↓↓↓↓↓")
-	console.log(row)
-	dialogFormVisible.value = true
-}
-//日期转换成年月日小时分钟秒
-const riqi_formatDate = (date) => {
-	return date.getFullYear() + '-' +
-	(date.getMonth() + 1).toString().padStart(2, '0') + '-' +
-	date.getDate().toString().padStart(2, '0') + ' ' +
-	date.getHours().toString().padStart(2, '0') + ':' +
-	date.getMinutes().toString().padStart(2, '0') + ':' +
-	date.getSeconds().toString().padStart(2, '0');
-}
-// 修改工单确定按钮
-const edit_gdenterDialog = async () => {
-	const lhriqi = riqi_formatDate(new Date(scgdformData.value['落货日期']));
-	const zdriqi = riqi_formatDate(new Date(scgdformData.value['制单日期']));
-	const shriqi = riqi_formatDate(new Date(scgdformData.value['审核日期']));
-	const formattedData = {
-		ddbh: scgdformData.value['订单编号'],
-		sckh: scgdformData.value['生产款号'],
-		khmc: scgdformData.value['款式'],
-		khdh: scgdformData.value['客户'],
-		cpdh: scgdformData.value['落货日期'],
-		cpmc: scgdformData.value['箱唛要求'],
-		ddsl: scgdformData.value['面料'],
-		tll: scgdformData.value['要求'],
-		jhtl: scgdformData.value['船样描述'],
-		sjtl: scgdformData.value['船样合计'],
-		jldw: scgdformData.value['粘朴'],
-		tldx: scgdformData.value['订单数量'],
-		xsddh: scgdformData.value['单位'],
-		jymb: scgdformData.value['制单人'],
-		bbh: scgdformData.value['制单日期'],
-		erp: scgdformData.value['审核人'],
-		ymsl: scgdformData.value['审核日期']
-	};
-	console.log(formattedData)
-	// const WorkOrderEdit_edit = await WorkOrderEdit(formattedData);
-	// if (WorkOrderEdit_edit.code === 0) {
-	// 	dialogFormVisible.value = false
-	// 	ElMessage({type: 'success',message: '更新成功' })
-	// } else {
-	// 	ElMessage({type: 'error', message: '更新失败'})
-	// }
-}
-// 修改工单关闭按钮
-const edit_gdcloseDialog = () => {
-	dialogFormVisible.value = false
-}
+
+
 
 //=========查询========
 const searchInfo = ref('')
@@ -3603,97 +3665,23 @@ const edit_getProductYjListdata = ref()
 const edit_getProductZhiListdata = ref()
 const edit_yjdh_keyword = ref('')
 const edit_zhi_keyword = ref('')
-
-//双击打开印件列表修改
+// =========== 修改 ===========
+const dialogFormVisible = ref(false)
+const edit_formData = ref({})
+//双击打开颜色资料列表修改
 const gdyjupdateCompanyFunc = async(row) => {
-  // gdyjformData['开数'] = row['开数'];
-  // gdyjformData['联数'] = row['联数'];
-  // Object.assign(gdyjformData,row);
-  // gdyjdialogFormVisible.value = true
-}
-
-//印件列表修改【确定】
-const gdyjenterDialog = async () => {
-  const formattedData = {
-    Uniqid: gdyjformData['Uniqid'],
-    yjno: gdyjformData['印件号'] ? gdyjformData['印件号'] : "",
-    yjdh: gdyjformData['印件代号'] ? gdyjformData['印件代号'] : "",
-    yjmc: gdyjformData['印件名称'] ? gdyjformData['印件名称'] : "",
-    zzdh:gdyjformData['纸张代号'] ? gdyjformData['纸张代号'] : "",
-    zzmc:gdyjformData['纸张名称'] ? gdyjformData['纸张名称'] : "",
-    zzdh1:gdyjformData['zzdh1'] ? gdyjformData['zzdh1'] : "",
-    zzdh2:gdyjformData['zzdh2'] ? gdyjformData['zzdh2'] : "",
-    zzdh3:gdyjformData['zzdh3'] ? gdyjformData['zzdh3'] : "",
-    zzdh4:gdyjformData['zzdh4'] ? gdyjformData['zzdh4'] : "",
-    zzmc1:gdyjformData['zzmc1'] ? gdyjformData['zzmc1'] : "",
-    zzmc2:gdyjformData['zzmc2'] ? gdyjformData['zzmc2'] : "",
-    zzmc3:gdyjformData['zzmc3'] ? gdyjformData['zzmc3'] : "",
-    zzmc4:gdyjformData['zzmc4'] ? gdyjformData['zzmc4'] : "",
-    cpsl:gdyjformData['订单数量'] ? gdyjformData['订单数量'] : "",
-    pztl:gdyjformData['平张投料'] ? gdyjformData['平张投料'] : "",
-    sjtl:gdyjformData['万小张'] ? gdyjformData['万小张'] : "",
-    tlgg:gdyjformData['投料规格'] ? gdyjformData['投料规格'] : "",
-    klgg:gdyjformData['开料规格'] ? gdyjformData['开料规格'] : "",
-    ks:gdyjformData['开数'] ? gdyjformData['开数'] : "",
-    ls:gdyjformData['联数'] ? gdyjformData['联数'] : "",
-    hsgg:gdyjformData['核算规格'] ? gdyjformData['核算规格'] : "",
-    desc:gdyjformData['备注'] ? gdyjformData['备注'] : "",
-  };
-  const PrintedEdit_edit = await PrintedEdit(formattedData);
-  if (PrintedEdit_edit.code === 0) {
-    gdyjdialogFormVisible.value = false
-    ElMessage({type: 'success',message: '更新成功' })
-	let row = {
-			 '工单编号':_Gd_gdbh.value,
-			 '产品代号':_Gd_cpdh.value,
-			 '产品名称':_Gd_cpmc.value,
-	}
-	tableRowClick (row)
-  } else {
-    ElMessage({type: 'error', message: '更新失败'})
-  }
-}
-
-// 印件列表修改【关闭弹窗】
-const gdyjcloseDialog = () => {
-  gdyjdialogFormVisible.value = false
-}
-
-//印件修改【印件代码】树状图
-const edit_handleTreeData = (treeData) => {
-  const data = Object.keys(treeData).map((key)=>({
-    label:key,
-    children: Object.keys(treeData[key]).map((keys)=>({
-      label:keys,
-      children:treeData[key][keys].map(item=>({
-        label:`${item.物料代码} ${item.物料名称}`,
-        物料代码:item.物料代码,
-        物料名称:item.物料名称
-      }))
-    }))
-  }))
-  return data
-}
-
-//印件修改【纸张】树状图
-const edit_handleTreeDatas = (treeData) => {
-  const data = Object.keys(treeData).map((key)=>({
-    label:key,
-    children: Object.keys(treeData[key]).map((keys)=>({
-      label:keys,
-      children:Object.keys(treeData[key][keys]).map((keyss)=>({
-        label:keyss,
-        children:treeData[key][keys][keyss].map(item=>({
-          label:`${item.物料代码} ${item.物料名称}`,
-          规格:item.规格,
-          物料代码:item.物料代码,
-          物料名称:item.物料名称
-        }))
-      }))
-    }))
-  }))
-  return data
+	console.log(row)
+	dialogFormVisible.value = true;
+	Object.assign(edit_formData.value,row);
 }
+// 修改确认
+const edit_Dialog = async (row) => {
+	dialogFormVisible.value = false;
+};
+// 修改取消
+const edit_closeDialog = async (row) => {
+	dialogFormVisible.value = false;
+};
 
 //3.4获取印件代码及名称
 const edit_getProductYjList = async ()=>{

src/view/yunyin/shengchanguanli/shengchanpaichan.vue

@@ -7,8 +7,8 @@
           <el-form ref="elSearchFormRef"  :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
               <!--按钮-->
-              <el-input v-model="searchInfo" placeholder="搜索工单编号"  style="width: 180px;"></el-input>
-              <el-button type="primary" title="搜索" icon="search"  @click="onSubmit"></el-button>
+              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
+              <el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
               <!-- <el-button type="primary" title="设置工单的状态--【计划中】 【生产中】 【已完成】" icon="edit" @click="onStatusClick" class="bt">工单状态设置</el-button> -->
 
               <div v-if="(currentNode == '计划中') && treeType === 'customTree'">
@@ -26,7 +26,7 @@
 
               <div v-else>
               </div> 
-              <el-button type="primary" title="打印生产工单" icon="edit" @click="pd_gdprintonClick" class="bt">工单打印</el-button> 
+              <el-button type="primary" title="打印生产工单" icon="edit" @click="pd_gdprintonClick" class="bt">订单打印</el-button> 
             </el-form-item>
           </el-form>
 
@@ -727,21 +727,18 @@ const workbenchdata = async () => {
     [{
       label : '车缝小烫车间',
       children : [
-      {label : '1.服装厂1组'},
-      {label : '2.服装厂2组'},
-      {label : '3.服装厂3组'},
-      {label : '4.服装厂4组'},
-      {label : '5.服装厂5组'},
-      {label : '6.服装厂6组'},
-      {label : '7.服装厂7组'},
-      {label : '8.服装厂8组'},
-      {label : '9.服装厂9组'},
-      {label : '10.服装厂10组'},
-      {label : '11.服装厂11组'},
-      {label : '12.服装厂12组'},
-      {label : '13.服装厂13组'},
-      {label : '14.服装厂14组'},
-      {label : '15.服装厂15组'}
+      {label : '车缝1组'},
+      {label : '车缝2组'},
+      {label : '车缝3组'},
+      {label : '车缝4组'},
+      {label : '车缝5组'},
+      {label : '车缝6组'},
+      {label : '车缝7组'},
+      {label : '车缝8组'},
+      {label : '车缝9组'},
+      {label : '车缝10组'},
+      {label : '车缝11组'},
+      {label : '车缝12组'},
     ]
     }];
     treeData.value = data
@@ -1889,6 +1886,7 @@ const cjsbpcformData = reactive({
   isBanciSelected: false,
 });
 
+//订单打印
 const pd_gdprintonClick = () => {
   printPageRef.value.open(_Gd_gdbh.value)
 }