Browse Source

工单资料

liuhairui 1 year ago
parent
commit
c630ff171e
2 changed files with 40 additions and 38 deletions
  1. 39 37
      src/view/job/job/job.vue
  2. 1 1
      src/view/yunyin/chanpinziliao/chanpinziliao.vue

+ 39 - 37
src/view/job/job/job.vue

@@ -14,31 +14,31 @@
 <!--        <el-header>dd</el-header>-->
         <el-main>
 
-          <div class="gva-search-box">
-            <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
-              <!-- <el-form-item label="创建日期" prop="createdAt">
-                <template #label>
-        <span>
-          创建日期
-          <el-tooltip content="搜索范围是开始日期(包含)至结束日期(不包含)">
-            <el-icon><QuestionFilled /></el-icon>
-          </el-tooltip>
-        </span>
-                </template>
-                <el-date-picker v-model="searchInfo.startCreatedAt" type="datetime" placeholder="开始日期" :disabled-date="time=> searchInfo.endCreatedAt ? time.getTime() > searchInfo.endCreatedAt.getTime() : false"></el-date-picker>
-                —
-                <el-date-picker v-model="searchInfo.endCreatedAt" type="datetime" placeholder="结束日期" :disabled-date="time=> searchInfo.startCreatedAt ? time.getTime() < searchInfo.startCreatedAt.getTime() : false"></el-date-picker>
-              </el-form-item> -->
-			  <el-form-item>
-			    <el-input v-model="searchInfo.search" :clearable="true"  placeholder="输入工单编号或产品名称"/>
-				<div>{{searchInfo.search}}</div>
-			  </el-form-item>
-              <el-form-item>
-                <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                <el-button icon="refresh" @click="onReset">重置</el-button>
-              </el-form-item>
-            </el-form>
-          </div>
+<!--          <div class="gva-search-box">-->
+<!--            <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">-->
+<!--              &lt;!&ndash; <el-form-item label="创建日期" prop="createdAt">-->
+<!--                <template #label>-->
+<!--        <span>-->
+<!--          创建日期-->
+<!--          <el-tooltip content="搜索范围是开始日期(包含)至结束日期(不包含)">-->
+<!--            <el-icon><QuestionFilled /></el-icon>-->
+<!--          </el-tooltip>-->
+<!--        </span>-->
+<!--                </template>-->
+<!--                <el-date-picker v-model="searchInfo.startCreatedAt" type="datetime" placeholder="开始日期" :disabled-date="time=> searchInfo.endCreatedAt ? time.getTime() > searchInfo.endCreatedAt.getTime() : false"></el-date-picker>-->
+<!---->
+<!--                <el-date-picker v-model="searchInfo.endCreatedAt" type="datetime" placeholder="结束日期" :disabled-date="time=> searchInfo.startCreatedAt ? time.getTime() < searchInfo.startCreatedAt.getTime() : false"></el-date-picker>-->
+<!--              </el-form-item> &ndash;&gt;-->
+<!--			  <el-form-item>-->
+<!--			    <el-input v-model="searchInfo.search"  placeholder="输入工单编号或产品名称"/>-->
+<!--&lt;!&ndash;				<div>{{searchInfo.search}}</div>&ndash;&gt;-->
+<!--			  </el-form-item>-->
+<!--              <el-form-item>-->
+<!--                <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>-->
+<!--                <el-button icon="refresh" @click="onReset">重置</el-button>-->
+<!--              </el-form-item>-->
+<!--            </el-form>-->
+<!--          </div>-->
           <div class="gva-table-box">
             <!-- <div class="gva-btn-list">
               <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
@@ -66,11 +66,11 @@
 				highlight-current-row="true"
             >
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column align="left" sortable fixed="left" label="设备编号" prop="设备编号" width="90" />
+              <el-table-column align="left" sortable fixed="left" label="设备编号" prop="设备编号" width="110" />
               <el-table-column align="left" sortable fixed="left" label="设备名称" prop="设备名称" width="200" />
               <el-table-column align="left" sortable label="生产工序" prop="生产工序" width="160" />
               <el-table-column align="left" sortable label="日定额" prop="日定额" width="100" />
-              <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="90" />
+              <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="110" />
               <el-table-column align="left" sortable label="机长" prop="机长" width="80" />
               <el-table-column align="left" sortable label="副机" prop="副机" width="80" />
               <el-table-column align="left" sortable label="调墨" prop="调墨" width="80" />
@@ -78,15 +78,15 @@
               <el-table-column align="left" sortable label="飞达" prop="飞达" width="80" />
               <el-table-column align="left" sortable label="辅助" prop="辅助" width="80" />
               <el-table-column align="left" sortable label="放卷" prop="放卷" width="80" />
-              <el-table-column align="left" sortable label="分切1" prop="分切1" width="80" />
-              <el-table-column align="left" sortable label="分切2" prop="分切2" width="80" />
+              <el-table-column align="left" sortable label="分切1" prop="分切1" width="100" />
+              <el-table-column align="left" sortable label="分切2" prop="分切2" width="100" />
               <el-table-column align="left" sortable label="检验" prop="检验" width="80" />
-              <el-table-column align="left" sortable label="使用部门" prop="使用部门" width="90" />
-              <el-table-column align="left" sortable label="设备编组" prop="" width="90" />
+              <el-table-column align="left" sortable label="使用部门" prop="使用部门" width="110" />
+              <el-table-column align="left" sortable label="设备编组" prop="" width="110" />
               <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120" />
               <el-table-column align="left" sortable label="创建时间" prop="mod_rq" width="160" />
               <el-table-column align="left" sortable label="修改时间" prop="sys_rq" width="160" />
-              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="75" >
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="100" >
               <!-- <el-table-column align="center" fixed="right" label="操作"  min-width="100"> -->
                <!-- <template #default="scope">
                   <el-button type="primary" link class="table-button" @click="getDetails(scope.row)">
@@ -133,7 +133,7 @@
 			    </el-form-item>
 			  	<el-form-item label="千元工价:"  prop="address" >
 			  	  <el-input v-model="formData.address" :clearable="true" />
-			  	</el-form-item>			
+			  	</el-form-item>
 			  </el-form>
 			  <el-form :model="formData" :inline="true" label-position="right" ref="elFormRef" :rules="rule" label-width="60px">
 			    <el-form-item label="机长:" style="margin-right: 0%;" prop="address" >
@@ -144,7 +144,7 @@
 			    </el-form-item>
 			  	<el-form-item label="调墨:" style="margin-right: 0%;" prop="address" >
 			  	  <el-input v-model="formData.address" :clearable="true"  style="width: 40px;" />
-			  	</el-form-item>	
+			  	</el-form-item>
 				<el-form-item label="二手:" style="margin-right: 0%;" prop="address" >
 				  <el-input v-model="formData.address" :clearable="true"  style="width: 40px;" />
 				</el-form-item>
@@ -153,7 +153,7 @@
 				</el-form-item>
 				<el-form-item label="辅助:" style="margin-right: 0%;" prop="address" >
 				  <el-input v-model="formData.address" :clearable="true"  style="width: 40px;" />
-				</el-form-item>	
+				</el-form-item>
 				<el-form-item label="放卷:" style="margin-right: 0%;" prop="address" >
 				  <el-input v-model="formData.address" :clearable="true" style="width: 40px;" />
 				</el-form-item>
@@ -162,7 +162,7 @@
 				</el-form-item>
 				<el-form-item label="分切2:" style="margin-right: 0%;" prop="address" >
 				  <el-input v-model="formData.address" :clearable="true" style="width: 40px;" />
-				</el-form-item>	
+				</el-form-item>
 				<el-form-item label="检验:" style="margin-right: 0%;" prop="address" >
 				  <el-input v-model="formData.address" :clearable="true"  style="width: 40px;" />
 				</el-form-item>
@@ -227,7 +227,7 @@ import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDow
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import { useUserStore } from '@/pinia/modules/user'
-const userStore = useUserStore() 
+const userStore = useUserStore()
 const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
     name: 'Company'
@@ -420,6 +420,8 @@ const type = ref('')
 
 // 更新行
 const updateCompanyFunc = async(row) => {
+  console.log(row)
+
     // const res = await findCompany({ ID: row.ID })
     type.value = 'update'
     // if (res.code === 0) {

+ 1 - 1
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -20,7 +20,7 @@
 			  <el-button type="primary" class="bt" icon="edit"  @click="addcp_onclick" >新增产品资料</el-button>
               <el-button type="primary" class="bt" icon="edit"  @click="addcpyj_onclick" v-if="addyj=== true">新增印件资料</el-button>
               <el-button type="primary" class="bt" icon="edit"  @click="addcpgy_onclick" v-if="addgy=== true">新增工艺资料</el-button>
-              <el-button type="primary" class="bt" icon="edit"  @click="addyb_onclick" v-if="addyb=== true">新增印版资料</el-button>
+<!--              <el-button type="primary" class="bt" icon="edit"  @click="addyb_onclick" v-if="addyb=== true">新增印版资料</el-button>-->
 			  <el-button type="primary" icon="edit"   @click="delgd_delclick" v-if="delall=== true" :disabled="yjSelection === '' && gySelection === ''"  class="bt" title="选择批量删除(印件资料或工艺资料)"  >删除</el-button>
 
 <!--              <el-button type="primary" class="bt" icon="Download" @click="cpexportToExcel" disabled>导出产品资料</el-button>-->