adjust some function

src/views/ccgl/kngl/bzzy/top/index.vue

@@ -7,8 +7,8 @@
 
     </template>
     <template #toolbar="ctx">
-      <!-- <el-button @click="zb(ctx.basePage)" size='mini' type="primary">装包</el-button> -->
-     <!-- <el-button @click="cb(ctx.basePage)" size='mini' type="primary">调整</el-button> -->
+    <el-button @click="mpwc(ctx.basePage)" size='mini'  type="primary">完成</el-button>
+     <el-button @click="qxwc(ctx.basePage)" size='mini'  type="primary">取消完成</el-button>
     </template>
 
   </BasePage>
@@ -27,7 +27,7 @@
           /* 手动控制删除 */
           delButton: false,
           /* 手动控制编辑按钮权限 */
-          editButton: false,
+          editButton: true,
           /* 是否渲染右侧操作按钮 */
           operateButtons: false,
           /* 是否开启工作流按钮 */
@@ -160,6 +160,38 @@
 
     },
     methods: {
+      qxwc(ctx){
+        if(ctx.singleItem&&ctx.singleItem.id){
+          this.$post('wms/kcgl/bzdj/cancelComplete',{
+            id:ctx.singleItem.id
+          }).then(res=>{
+            if(res.success){
+              this.$success('操作成功')
+              ctx.refresh()
+            }
+          })
+
+        }else{
+          this.warning('请选中一条数据')
+        }
+
+      },
+      mpwc(ctx){
+        if(ctx.singleItem&&ctx.singleItem.id){
+          this.$post('wms/kcgl/bzdj/complete',{
+            id:ctx.singleItem.id
+          }).then(res=>{
+            if(res.success){
+              this.$success('操作成功')
+              ctx.refresh()
+            }
+          })
+
+        }else{
+          this.warning('请选中一条数据')
+        }
+
+      },
       getRow(val) {
         this.$emit('getRow', val)
       },

src/views/ccgl/thgl/rkth/top/akck.vue

@@ -11,8 +11,8 @@
       </el-row>
 
       <div class="editTab">
-        <editTableForEdit  :AuxButton='false'  code='WMSWLXX' :indexApp='app' :type='type' @save='save' ref="editTableForEdit"
-          :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
+        <editTableForEdit :AuxButton='false' code='WMSWLXX' :indexApp='app' :type='type' @save='save'
+          ref="editTableForEdit" :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
           :editTableData="formDetail">
 
           <template #toolbar="ctx">
@@ -27,8 +27,7 @@
       <el-row :gutter="20" :app="this" class="editRow bottomInfo">
         <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
           v-for="(item,index) in editColItemList2 " :value="item.value" :span="item.span" :label="item.label"
-     		:prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig'
-     		:rule="item.rule" />
+          :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
         <!-- 额外数据 -->
       </el-row>
     </el-form>
@@ -50,58 +49,59 @@
   export default {
     mixins: [editMixin, editMixin_expand],
     methods: {
-      kcSave(obj){
+      kcSave(obj) {
 
-        let {list}=obj
+        let {
+          list
+        } = obj
 
-        this.form.ckid=list[0].ckid
-        this.form.hzid=list[0].hzid
-        this.form.hzName=list[0].hzName
+        this.form.ckid = list[0].ckid
+        this.form.hzid = list[0].hzid
+        this.form.hzName = list[0].hzName
         // this.form.ywrq=row.ywrq
         let length = this.formDetail.length
         this.formDetail.splice(0, length)
         list.forEach(item => {
-          item.bcsl=item.kcsl
-          item.lydjid = item.id
+          item.sl = 0
           delete item.id
           this.formDetail.push(_.cloneDeep(item))
         })
       },
-      xzkc(){
-        this.showDialog=true
+      xzkc() {
+        this.showDialog = true
       },
       /* 需要整体row时的回调 */
       computedRow(row) {
         // this.$refs.editTableForEdit.$forceUpdate()
       },
       /* 选择list时的回调 */
-      save(list) {
-        list.forEach(item => {
-          // 转换并且push
-          item.wlid = item.id
-          item.wlxxName = item.name
-          item.wlxxCode = item.code
-          item.wlxxGg = item.gg
-          item.sl = 0
-          item.xqrq = new Date().getTime()
-          delete item.id
-          this.formDetail.push(_.cloneDeep(item))
+      // save(list) {
+      //   list.forEach(item => {
+      //     // 转换并且push
+      //     item.wlid = item.id
+      //     item.wlxxName = item.name
+      //     item.wlxxCode = item.code
+      //     item.wlxxGg = item.gg
+      //     item.sl = 0
+      //     item.xqrq = new Date().getTime()
+      //     delete item.id
+      //     this.formDetail.push(_.cloneDeep(item))
 
-        })
-      }
+      //   })
+      // }
     },
-    components:{
+    components: {
       Kc
     },
     data() {
       return {
-        form:{
-          djly:'KC'
+        form: {
+          djly: 'KC'
         },
         DialogWidth: '70vw',
         DialogName: '',
         DialogTitle: '选择库存',
-        showDialog:false,
+        showDialog: false,
         /* 常规edit数据 */
         editColItemList: [{
             label: '出库单号',
@@ -165,7 +165,7 @@
           },
           {
             label: '货主',
-                      readonly:true,
+            readonly: true,
             prop: 'hzid',
             span: 8,
             required: true,
@@ -231,7 +231,7 @@
             field: "sl",
             allowEdit: true,
             type: 'inputNumber',
-            width: 200,
+            // width: 200,
             blur: toFixed(null),
           },
           /* 不可编辑*/

src/views/ccgl/thgl/rkth/top/kc.vue

@@ -39,7 +39,6 @@
     },
     data() {
       return {
-
       power: {
       	add: false,
       	copy: false,
@@ -53,8 +52,8 @@
       },
       config: {
       	/* 基本配置*/
-      	url: 'wms/ckgl/dbck/query/kc',
-        queryUrl:'wms/ckgl/dbck/query/kc',
+      	url: 'lxyl/ckgl/cktz/query/kc',
+        queryUrl:'lxyl/ckgl/cktz/query/kc',
       	tableTitle: [{
               title: "库位",
               field: "kwName",