2023-5-9

src/HDrpManagement/serveWorkBill/components/printTable.vue

@@ -589,7 +589,7 @@ export default {
             let dataURL = CANVAS.toDataURL("image/jpg")
             node.src = dataURL
 
-            if (that.detail.status == '新建') {
+            if (that.detail.status == '新建' || this.$route.query.action == 1) {
               that.submit()
             } else {
               domtoimage.toJpeg(that.$refs.container,{
@@ -662,7 +662,7 @@ export default {
           "content": {
               "ownertable": "sa_workorder_confirmation",
               "ownerid": this.$route.query.ownerid,
-              "usetype": "default",
+              "usetype": "comfirmbill",
               "attachmentids": [
                   res.data.attachmentids[0]
               ]

src/HDrpManagement/serveWorkBill/modules/checkBill/index.vue

@@ -22,9 +22,9 @@
         </template>
         <template v-slot:opreation="scope">
           <slot name="download" :data="scope.data"></slot>
-          <printTable :data="scope.data">
+          <!-- <printTable :data="scope.data">
 
-          </printTable>
+          </printTable> -->
         </template>
       </tableLayout>
     </div>

src/HManagement/department/modules/edit_dep.vue

@@ -30,7 +30,7 @@
               <el-input class="item_width-full" v-model="form.sequence" placeholder="请输入部门排序号" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="上级部门">
               <select-area ref="selectArea" @onClick="onClick">
                 <el-input 
@@ -43,7 +43,7 @@
                 ></el-input>
               </select-area>
             </el-form-item>
-          </el-col> -->
+          </el-col>
           <el-col :span="12">
             <el-form-item label="是否启用">
               <el-checkbox v-model="form.isused" :false-label="0" :true-label="1">是否启用</el-checkbox>