Merge branch '20231126-yw' into dev_ksck

src/views/thirdSys/invOrder/thrInvOrder.vue

@@ -79,12 +79,25 @@
         <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
         <el-table-column label="外部系统" prop="thirdSysFk"></el-table-column>
         <el-table-column label="单据状态" prop="status"></el-table-column>
+        <el-table-column
+          prop="status"
+          label="单据状态"
+          width="100"
+          :filters="[{ text: '待生成', value: '0' }, { text: '已生成', value: '1' }]"
+          :filter-method="filterTag"
+          filter-placement="bottom-end">
+          <template slot-scope="scope">
+            <el-tag
+              :type="scope.row.status == '1' ? 'primary' : 'success'"
+              disable-transitions>{{scope.row.status}}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="160">
           <template slot-scope="scope">
             <el-button type="text" @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button>
-            <el-button type="text" @click.native.stop="generateBill(scope.row)"
+            <el-button v-show="scope.row.status == 0" type="text" @click.native.stop="generateBill(scope.row)"
             >生成单据
             </el-button>
           </template>

src/views/thirdSys/invOrder/thrInvOrderGenerate.vue

@@ -157,6 +157,9 @@ export default {
       generateOrder(this.generateOrderDate).then((res) => {
         if (res.code == 20000) {
           this.$message.success("生成成功!");
+          //清空弹窗数据
+          this.$emit("closeAddDialog", true);
+          this.closeAddDialog(true);
         } else
           this.$message.error(res.message);
       }).catch((error) => {